Updates per aptalca

This commit is contained in:
TheCaptain989
2020-10-07 20:13:39 -05:00
parent 85ef895b43
commit 52ce0f24f7
4 changed files with 2 additions and 43 deletions
-14
View File
@@ -22,32 +22,18 @@ jobs:
script: script:
# Build variables # Build variables
- VERSION=$(git describe --tags --always) - VERSION=$(git describe --tags --always)
- VCS_REF=$(git rev-parse --short HEAD)
- BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
# Build image # Build image
- docker build --no-cache - docker build --no-cache
--build-arg VERSION=${VERSION} --build-arg VERSION=${VERSION}
--build-arg VCS_REF=${VCS_REF}
--build-arg BUILD_DATE=${BUILD_DATE}
--build-arg DOCKERHUB=${DOCKERHUB}
--build-arg BASEIMAGE=${BASEIMAGE}
--build-arg MODNAME=${MODNAME}
-t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} . -t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} .
- stage: BuildImage - stage: BuildImage
if: (NOT (type IN (pull_request))) if: (NOT (type IN (pull_request)))
script: script:
# Build variables # Build variables
- VERSION=$(git describe --tags --always) - VERSION=$(git describe --tags --always)
- VCS_REF=$(git rev-parse --short HEAD)
- BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
# Build image # Build image
- docker build --no-cache - docker build --no-cache
--build-arg VERSION=${VERSION} --build-arg VERSION=${VERSION}
--build-arg VCS_REF=${VCS_REF}
--build-arg BUILD_DATE=${BUILD_DATE}
--build-arg DOCKERHUB=${DOCKERHUB}
--build-arg BASEIMAGE=${BASEIMAGE}
--build-arg MODNAME=${MODNAME}
-t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} . -t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} .
- docker tag ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} ${DOCKERHUB}:${BASEIMAGE}-${MODNAME} - docker tag ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}
# Login to DockerHub # Login to DockerHub
-26
View File
@@ -2,33 +2,7 @@
FROM lsiobase/ubuntu:xenial as buildstage FROM lsiobase/ubuntu:xenial as buildstage
# Build arguments # Build arguments
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION ARG VERSION
ARG DOCKERHUB
ARG BASEIMAGE
ARG MODNAME
# Build-time metadata as defined at http://label-schema.org
LABEL org.label-schema.name="${DOCKERHUB}:${BASEIMAGE}-${MODNAME}" \
org.label-schema.description="A Docker Mod for the LinuxServer.io Radarr/Sonarr container that adds mkvtoolnix and script for remuxing video files" \
org.label-schema.url="https://hub.docker.com/r/${DOCKERHUB}" \
org.label-schema.version=$VERSION \
org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vendor="TheCaptain989" \
org.label-schema.schema-version="1.0" \
org.label-schema.vcs-url="https://github.com/linuxserver/docker-mods/tree/radarr-striptracks/" \
org.label-schema.vcs-ref=$VCS_REF
# Build-time metadata as defined at https://github.com/opencontainers/image-spec
LABEL org.opencontainers.image.title="${DOCKERHUB}:${BASEIMAGE}-${MODNAME}" \
org.opencontainers.image.description="A Docker Mod for the LinuxServer.io Radarr/Sonarr container that adds mkvtoolnix and script for remuxing video files" \
org.opencontainers.image.url="https://hub.docker.com/r/${DOCKERHUB}" \
org.opencontainers.image.version=$VERSION \
org.opencontainers.image.created=$BUILD_DATE \
org.opencontainers.image.vendor="TheCaptain989" \
org.opencontainers.image.source="https://github.com/linuxserver/docker-mods/tree/radarr-striptracks/" \
org.opencontainers.image.revision=$VCS_REF
# Add version number for use in container init script # Add version number for use in container init script
RUN mkdir -p /root-layer/etc && \ RUN mkdir -p /root-layer/etc && \
-1
View File
@@ -6,7 +6,6 @@ Chapters, if they exist, are preserved. The Title attribute in the MKV is set to
Container info: Container info:
![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/linuxserver/mods/radarr-striptracks) ![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/linuxserver/mods/radarr-striptracks)
![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/mods/radarr-striptracks "Container Pulls")
# Installation # Installation
>**NOTE:** See the [Sonarr/Radarr v3 Builds](./README.md#sonarrradarr-v3-builds) section below for important differences to these instructions for v3 builds. >**NOTE:** See the [Sonarr/Radarr v3 Builds](./README.md#sonarrradarr-v3-builds) section below for important differences to these instructions for v3 builds.
@@ -22,7 +22,7 @@ if [ ! -f /usr/bin/mkvmerge ]; then
elif [ -f /sbin/apk ]; then elif [ -f /sbin/apk ]; then
# Alpine # Alpine
echo "Installing MKVToolNix using apk" echo "Installing MKVToolNix using apk"
apk add mkvtoolnix && \ apk add --no-cache mkvtoolnix && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
else else
# Unknown # Unknown
@@ -36,7 +36,7 @@ fi
# Change ownership # Change ownership
if [ $(stat -c '%G' /usr/local/bin/striptracks.sh) != "users" ]; then if [ $(stat -c '%G' /usr/local/bin/striptracks.sh) != "users" ]; then
echo "Changing ownership on scripts." echo "Changing ownership on scripts."
chown root:users /usr/local/bin/striptracks*.sh chown abc:abc /usr/local/bin/striptracks*.sh
fi fi
# Make executable # Make executable