From e40a396fdcf752c9fc426cb03b291c84b351e696 Mon Sep 17 00:00:00 2001 From: jonny Date: Thu, 11 Mar 2021 14:46:57 +0000 Subject: [PATCH 1/6] 'update files with ansible' --- Dockerfile | 22 +++++++--------------- Jenkinsfile | 7 ++++--- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 524eee0..6513ca1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,26 +1,18 @@ # 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.1 -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='develop' \ - SONARR_USER='sonarr' \ - SONARR_GROUP='sonarr' \ - SONARR_UID='1027' \ - SONARR_GID='1027' RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk -U update && \ apk -U upgrade --ignore alpine-baselayout && \ - apk -U add \ - libmediainfo \ - ca-certificates \ - mono \ - && \ + apk -U add libmediainfo ca-certificates mono && \ apk del make gcc g++ && \ rm -rf /tmp/src && \ rm -rf /var/cache/apk/* @@ -28,12 +20,12 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie RUN wget https://update.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -O nzbdrone.tar.gz && \ tar zxvf nzbdrone.tar.gz && \ rm -rf nzbdrone.tar.gz && \ - addgroup -g $SONARR_GID $SONARR_GROUP && \ - adduser -D -u $SONARR_UID -G $SONARR_GROUP -H $SONARR_USER && \ - chown -R $SONARR_USER:$SONARR_GROUP /NzbDrone + addgroup -g 1027 sonarr && \ + adduser -D -u 1027 -G sonarr -H sonarr && \ + chown -R sonarr:sonarr /NzbDrone EXPOSE 8989 -USER $SONARR_USER +USER sonarr CMD [ "/usr/bin/mono", "--debug", "/NzbDrone/NzbDrone.exe", "--nobrowser", "--data=/config" ] diff --git a/Jenkinsfile b/Jenkinsfile index e63e746..aacc5a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,9 +1,10 @@ + podTemplate(yaml: """ 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 +28,11 @@ spec: stage('Build with Kaniko') { git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-sonarr.git', credentialsId: 'jenkins-to-git' container('kaniko') { - sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:v2.0.0.5344 --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:v2' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:v2.0.0.5344-3.13.1' } } stage('Notify gchat') { - hangoutsNotify message: "Sonarr 2 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "NZBget 2.0.0.5344 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } } From 4cd93bad7a4476e7cd22a8bc0678cdbf33b014df Mon Sep 17 00:00:00 2001 From: jonny Date: Thu, 11 Mar 2021 14:49:42 +0000 Subject: [PATCH 2/6] 'update files with ansible' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6513ca1..af21250 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ LABEL maintainer="Jonathan Ervine docker@ervine.org" ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='develop' \ + VERSION='develop' RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk -U update && \ From 45a19e2867b390de1354e140d956bb03d7444c6c Mon Sep 17 00:00:00 2001 From: jonny Date: Wed, 31 Mar 2021 02:21:07 +0000 Subject: [PATCH 3/6] 'update files with ansible' --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index af21250..32bb435 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base on latest (edge) alpine image -FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.1 +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.2 LABEL maintainer="Jonathan Ervine docker@ervine.org" diff --git a/Jenkinsfile b/Jenkinsfile index aacc5a7..94a2e04 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ spec: stage('Build with Kaniko') { git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-sonarr.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/sonarr:v2.0.0.5344-3.13.1' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:v2.0.0.5344-3.13.2' } } stage('Notify gchat') { From 589869b4f1b348d5430ae4f46d45110b58a22226 Mon Sep 17 00:00:00 2001 From: jonny Date: Wed, 31 Mar 2021 04:08:30 +0000 Subject: [PATCH 4/6] 'update files with ansible' --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 32bb435..9e52e81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base on latest (edge) alpine image -FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.2 +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.3 LABEL maintainer="Jonathan Ervine docker@ervine.org" diff --git a/Jenkinsfile b/Jenkinsfile index 94a2e04..25e6c1a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ spec: stage('Build with Kaniko') { git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-sonarr.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/sonarr:v2.0.0.5344-3.13.2' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:v2.0.0.5344-3.13.3' } } stage('Notify gchat') { From 018797e44b840f4d7049fe84c5fb8823dd47b154 Mon Sep 17 00:00:00 2001 From: jonny Date: Mon, 17 May 2021 13:53:09 +0000 Subject: [PATCH 5/6] 'update files with ansible' --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9e52e81..42d4437 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base on latest (edge) alpine image -FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.3 +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.5 LABEL maintainer="Jonathan Ervine docker@ervine.org" diff --git a/Jenkinsfile b/Jenkinsfile index 25e6c1a..4da1167 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ spec: stage('Build with Kaniko') { git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-sonarr.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/sonarr:v2.0.0.5344-3.13.3' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:v2.0.0.5344-3.13.5' } } stage('Notify gchat') { From 6cf9644c4043ab22a4cc7a83e9a4aa3edd517123 Mon Sep 17 00:00:00 2001 From: jonny Date: Thu, 24 Jun 2021 15:26:32 +0000 Subject: [PATCH 6/6] 'update files with ansible' --- Dockerfile | 14 +++++++------- Jenkinsfile | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 42d4437..16b1a3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,25 +7,25 @@ LABEL maintainer="Jonathan Ervine docker@ervine.org" ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='develop' + VERSION='3' RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk -U update && \ apk -U upgrade --ignore alpine-baselayout && \ - apk -U add libmediainfo ca-certificates mono && \ + apk -U add libmediainfo ca-certificates mono zip && \ apk del make gcc g++ && \ rm -rf /tmp/src && \ rm -rf /var/cache/apk/* -RUN wget https://update.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -O nzbdrone.tar.gz && \ - tar zxvf nzbdrone.tar.gz && \ - rm -rf nzbdrone.tar.gz && \ +RUN curl -o sonarr.zip https://services.sonarr.tv/v1/download/main/latest?version=3&os=linux && \ + unzip sonarr.zip && \ + rm -rf sonarr.zip && \ addgroup -g 1027 sonarr && \ adduser -D -u 1027 -G sonarr -H sonarr && \ - chown -R sonarr:sonarr /NzbDrone + chown -R sonarr:sonarr /Sonarr EXPOSE 8989 USER sonarr -CMD [ "/usr/bin/mono", "--debug", "/NzbDrone/NzbDrone.exe", "--nobrowser", "--data=/config" ] +CMD [ "/usr/bin/mono", "--debug", "/Sonarr/Sonarr.exe", "--nobrowser", "--data=/config" ] diff --git a/Jenkinsfile b/Jenkinsfile index 4da1167..2d3bed9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,11 +28,11 @@ spec: stage('Build with Kaniko') { git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-sonarr.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/sonarr:v2.0.0.5344-3.13.5' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:v3.0.6.1265-3.13.5' } } stage('Notify gchat') { - hangoutsNotify message: "NZBget 2.0.0.5344 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "NZBget 3.0.6.1265 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } }