diff --git a/Dockerfile b/Dockerfile index ec8fe8a..35e49e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,12 @@ # Base on latest (edge) alpine image -FROM harbor.ervine.dev/public/x86_64/alpine:v3.13 +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.3:v3.13.3 -LABEL maintainer="Jonathan Ervine " +LABEL maintainer="Jonathan Ervine docker@ervine.org" # Install updates ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='3.0.2.4552' \ - RADARR_USER='radarr' \ - RADARR_GROUP='radarr' \ - RADARR_UID='1027' \ - RADARR_GID='1027' RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk -U update && \ @@ -20,15 +15,15 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie apk del make gcc g++ && \ rm -rf /tmp/src && \ rm -rf /var/cache/apk/* && \ - curl -SL https://github.com/Radarr/Radarr/releases/download/v$VERSION/Radarr.master.$VERSION.linux-musl-core-x64.tar.gz | tar zxv && \ - addgroup -g $RADARR_GID $RADARR_GROUP && \ - adduser -D -u $RADARR_UID -G $RADARR_GROUP -H $RADARR_USER && \ - chown -R $RADARR_USER:$RADARR_GROUP /Radarr + curl -SL https://github.com/Radarr/Radarr/releases/download/v3.0.2.4552/Radarr.master.3.0.2.4552.linux-musl-core-x64.tar.gz | tar zxv && \ + addgroup -g 1027 radarr && \ + adduser -D -u 1027 -G radarr -H radarr && \ + chown -R radarr:radarr /Radarr EXPOSE 7878 -USER $RADARR_USER +USER radarr WORKDIR /Radarr -CMD [ "/Radarr/Radarr", "--nobrowser", "--data=/config" ] +CMD [ "/Radarr/Radarr", "--nobrowser", "--data=//config" ] diff --git a/Jenkinsfile b/Jenkinsfile index 7ef464d..277fec4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ kind: Pod spec: containers: - name: kaniko - image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251 + image: gcr.io/kaniko-project/executor:debug imagePullPolicy: Always command: - /busybox/cat @@ -27,11 +27,11 @@ spec: stage('Build with Kaniko') { git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-radarr.git', credentialsId: 'jenkins-to-git' container('kaniko') { - sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/radarr:v3.0.2.4522 --destination=harbor.ervine.dev/public/x86_64/alpine/radarr:v3.0' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine//app_name:v3.0.2.4552 --destination=harbor.ervine.dev/public/x86_64/alpine//radarr:v3.0' } } stage('Notify gchat') { - hangoutsNotify message: "Radarr Movie Manager v3.0.2.4522 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "Radarr Movie Manager 3.0.2.4552 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } } diff --git a/chart/radarr/Chart.yaml b/chart/radarr/Chart.yaml index 2a3f689..b4c25ff 100644 --- a/chart/radarr/Chart.yaml +++ b/chart/radarr/Chart.yaml @@ -18,6 +18,6 @@ version: 0.1.7 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: v3.0.2.4522 +appVersion: 3.0.2.4552 icon: https://git.ervine.org/jonny/x86_64-alpine-radarr/raw/branch/master/radarr.png