From 951900a7145cfac809da46d3a37bd38e3a3eebcb Mon Sep 17 00:00:00 2001 From: jonny Date: Thu, 4 Mar 2021 16:04:49 +0000 Subject: [PATCH 1/6] 'update files with ansible' --- Dockerfile | 19 +++++++------------ Jenkinsfile | 6 +++--- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index caed4b1..3582874 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,27 +6,22 @@ MAINTAINER “Jonathan Ervine” # Install updates ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ - TERM='xterm' \ - VERSION='3.13.0' \ - HYDRA_USER=hydra \ - MYNAME=jonny \ - HYDRA_UID=1027 \ - HYDRA_GID=1027 - + TERM='xterm' RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk update && \ apk -U upgrade --ignore alpine-baselayout && \ apk -U add unzip python3 -RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v$VERSION/nzbhydra2-$VERSION-linux.zip -O nzbhydra.zip && \ +RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v3.13.0/nzbhydra2-3.13.0-linux.zip -O hydra.zip && \ mkdir /nzbhydra && \ - unzip /nzbhydra.zip -d /nzbhydra && \ + unzip /hydra.zip -d /nzbhydra && \ chmod 755 /nzbhydra/nzbhydra2 && \ - rm -rf /nzbhydra.zip /tmp/src /var/cache/apk/* && \ - addgroup -g $HYDRA_GID $HYDRA_USER && \ - adduser -D -u $HYDRA_UID -G $HYDRA_USER -H $HYDRA_USER + rm -rf /hydra.zip /tmp/src /var/cache/apk/* && \ + addgroup -g 1027 hydra && \ + adduser -D -u 1027 -G hydra -H hydra +USER hydra EXPOSE 5076 VOLUME /config WORKDIR /nzbhydra diff --git a/Jenkinsfile b/Jenkinsfile index 48c593a..cb5d352 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +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 @@ -28,7 +28,7 @@ spec: stage('Build with Kaniko') { git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-nzbhydra.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/nzbhydra2:v3.13.0 --destination=harbor.ervine.dev/public/x86_64/alpine/nzbhydra2:v3.13' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine//nzbhydra2:v3.13.0' } } stage('Notify gchat') { From d91378cc80432be94ab02a5b9db75998690506ff Mon Sep 17 00:00:00 2001 From: jonny Date: Thu, 4 Mar 2021 16:09:37 +0000 Subject: [PATCH 2/6] 'update files with ansible' --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cb5d352..8de75e8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ ---- + podTemplate(yaml: """ kind: Pod spec: From 3e3c2327df27b23a0ea6d98c3d6445ce6d31dcff Mon Sep 17 00:00:00 2001 From: jonny Date: Thu, 4 Mar 2021 16:17:19 +0000 Subject: [PATCH 3/6] 'update files with ansible' --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8de75e8..28ba778 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-nzbhydra.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//nzbhydra2:v3.13.0' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/nzbhydra2:v3.13.0' } } stage('Notify gchat') { From 9725ab08de299299fc945e0197767c1ab059c0e9 Mon Sep 17 00:00:00 2001 From: jonny Date: Wed, 31 Mar 2021 02:07:11 +0000 Subject: [PATCH 4/6] 'update files with ansible' --- Dockerfile | 4 ++-- Jenkinsfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3582874..5b92bb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base on latest (edge) alpine image -FROM harbor.ervine.dev/public/x86_64/alpine/liberica-openjdk-alpine-musl:14.0.2-x86_64 +FROM harbor.ervine.dev/public/x86_64/liberica-openjdk-alpine-musl:14.0.2-x86_64 MAINTAINER “Jonathan Ervine” @@ -13,7 +13,7 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie apk -U upgrade --ignore alpine-baselayout && \ apk -U add unzip python3 -RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v3.13.0/nzbhydra2-3.13.0-linux.zip -O hydra.zip && \ +RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v3.13.2/nzbhydra2-3.13.2-linux.zip -O hydra.zip && \ mkdir /nzbhydra && \ unzip /hydra.zip -d /nzbhydra && \ chmod 755 /nzbhydra/nzbhydra2 && \ diff --git a/Jenkinsfile b/Jenkinsfile index 28ba778..64f32c5 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-nzbhydra.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/nzbhydra2:v3.13.0' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/nzbhydra2:v3.13.2' } } stage('Notify gchat') { - hangoutsNotify message: "NZBhydra 3.13.0 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "NZBhydra 3.13.2 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } } From a8da0d576b6ec2c3ccd411bb9f316d765b5c224c Mon Sep 17 00:00:00 2001 From: jonny Date: Wed, 31 Mar 2021 02:17:43 +0000 Subject: [PATCH 5/6] 'update files with ansible' --- Dockerfile | 4 ++-- Jenkinsfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b92bb2..604ef60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base on latest (edge) alpine image -FROM harbor.ervine.dev/public/x86_64/liberica-openjdk-alpine-musl:14.0.2-x86_64 +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.2 MAINTAINER “Jonathan Ervine” @@ -13,7 +13,7 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie apk -U upgrade --ignore alpine-baselayout && \ apk -U add unzip python3 -RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v3.13.2/nzbhydra2-3.13.2-linux.zip -O hydra.zip && \ +RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v3.0.2.4552/nzbhydra2-3.0.2.4552-linux.zip -O hydra.zip && \ mkdir /nzbhydra && \ unzip /hydra.zip -d /nzbhydra && \ chmod 755 /nzbhydra/nzbhydra2 && \ diff --git a/Jenkinsfile b/Jenkinsfile index 64f32c5..0463f68 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-nzbhydra.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/nzbhydra2:v3.13.2' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/nzbhydra2:v3.0.2.4552' } } stage('Notify gchat') { - hangoutsNotify message: "NZBhydra 3.13.2 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "NZBhydra 3.0.2.4552 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } } From 75a940978c68906ca487f9419845e0c37ad2df1f Mon Sep 17 00:00:00 2001 From: jonny Date: Wed, 31 Mar 2021 04:03:51 +0000 Subject: [PATCH 6/6] 'update files with ansible' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 604ef60..69a2511 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 MAINTAINER “Jonathan Ervine”