From 080584bdec40165012ad43f735ba4d4a4c15526d Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 03:57:06 +0000 Subject: [PATCH 01/49] new file: Dockerfile new file: Jenkinsfile Initial commit --- Dockerfile | 37 +++++++++++++++++++++++++++++++++++++ Jenkinsfile | 17 +++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 Dockerfile create mode 100644 Jenkinsfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..711ec06 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,37 @@ +# Base on latest (edge) alpine image +FROM harbor.ervine.dev/library/x86_64/alpine/alpine-3.11 + +MAINTAINER “Jonathan Ervine” + +# Install updates +ENV LANG='en_US.UTF-8' \ + LANGUAGE='en_US.UTF-8' \ + TERM='xterm' \ + VERSION='2.13.13' \ + MED_USER='mediaservice' \ + MED_GROUP='mediaservice' \ + MED_UID='1003' \ + MED_GID='1003' + +RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ + apk update && \ + apk -U upgrade && \ + apk -U add \ + python + +RUN wget https://github.com/theotherp/nzbhydra2/archive/$VERSION.tar.gz -O nzbhydra.tar.gz && \ + tar zxvf nzbhydra.tar.gz && \ + mv nzbhydra-$VERSION nzbhydra && \ + rm -rf nzbhydra.tar.gz && \ + apk del make gcc g++ && \ + rm -rf /tmp/src && \ + rm -rf /var/cache/apk/* && \ + addgroup -g $MED_GID $MED_GROUP && \ + adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER && \ + chown -R $MED_USER:$MED_GROUP /nzbhydra + +EXPOSE 5075 + +USER $MED_USER + +CMD [ "/usr/bin/python", "/nzbhydra/nzbhydra.py", "--nobrowser", "--config=/config/settings.cfg" ] diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..c17c8e9 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,17 @@ +node("docker-node") { + docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') { + + git branch: "3.11.3", url: "ssh://git@git.ervine.org:2222/jonny/x86_64-alpine-nzbhydra", credentialsId: 'jenkins-to-git' + + sh "git rev-parse HEAD > .git/commit-id" + def commit_id = readFile('.git/commit-id').trim() + println commit_id + + stage "build" + def app = docker.build "library/x86_64/alpine/nzbhydra2" + + stage "publish" + app.push("${env.BUILD_NUMBER}") + app.push("latest") + } +} From fc5d4673241023817e9eabbd06a504c834c3d5c9 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 04:00:23 +0000 Subject: [PATCH 02/49] modified: Dockerfile Corrected archive output name to be version 2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 711ec06..7a55a2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie RUN wget https://github.com/theotherp/nzbhydra2/archive/$VERSION.tar.gz -O nzbhydra.tar.gz && \ tar zxvf nzbhydra.tar.gz && \ - mv nzbhydra-$VERSION nzbhydra && \ + mv nzbhydra2-$VERSION nzbhydra && \ rm -rf nzbhydra.tar.gz && \ apk del make gcc g++ && \ rm -rf /tmp/src && \ From a920186965aa615fc4b5f43c4e27060733aa1b4c Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 04:04:19 +0000 Subject: [PATCH 03/49] modified: Dockerfile Separated out individual RUN commands --- Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a55a2b..e3781f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,19 +16,19 @@ ENV LANG='en_US.UTF-8' \ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk update && \ apk -U upgrade && \ - apk -U add \ - python + apk -U add python -RUN wget https://github.com/theotherp/nzbhydra2/archive/$VERSION.tar.gz -O nzbhydra.tar.gz && \ - tar zxvf nzbhydra.tar.gz && \ - mv nzbhydra2-$VERSION nzbhydra && \ - rm -rf nzbhydra.tar.gz && \ - apk del make gcc g++ && \ - rm -rf /tmp/src && \ - rm -rf /var/cache/apk/* && \ - addgroup -g $MED_GID $MED_GROUP && \ - adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER && \ - chown -R $MED_USER:$MED_GROUP /nzbhydra +RUN echo $VERSION +RUN wget https://github.com/theotherp/nzbhydra2/archive/$VERSION.tar.gz -O nzbhydra.tar.gz +RUN tar zxvf nzbhydra.tar.gz +RUN mv nzbhydra2-$VERSION nzbhydra +RUN rm -rf nzbhydra.tar.gz +RUN apk del make gcc g++ +RUN rm -rf /tmp/src +RUN rm -rf /var/cache/apk/* +RUN addgroup -g $MED_GID $MED_GROUP +RUN adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER +RUN chown -R $MED_USER:$MED_GROUP /nzbhydra EXPOSE 5075 From 81c152852c3cdf1684045820dc1201790790cef3 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 04:07:54 +0000 Subject: [PATCH 04/49] modified: Dockerfile Added missing v to download URL --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e3781f0..767a1d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie apk -U add python RUN echo $VERSION -RUN wget https://github.com/theotherp/nzbhydra2/archive/$VERSION.tar.gz -O nzbhydra.tar.gz +RUN wget https://github.com/theotherp/nzbhydra2/archive/v$VERSION.tar.gz -O nzbhydra.tar.gz RUN tar zxvf nzbhydra.tar.gz RUN mv nzbhydra2-$VERSION nzbhydra RUN rm -rf nzbhydra.tar.gz From 5dc2c3a13b035631db515a3ba11d5f2583162971 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 08:34:03 +0000 Subject: [PATCH 05/49] modified: Dockerfile Updated Dockerfile to launch NZBhydra2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 767a1d5..c1df2f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,4 +34,4 @@ EXPOSE 5075 USER $MED_USER -CMD [ "/usr/bin/python", "/nzbhydra/nzbhydra.py", "--nobrowser", "--config=/config/settings.cfg" ] +CMD [ "/usr/bin/python3", "/nzbhydra/other/wrapper/nzbhydra2wrapperPy3.py", "--nobrowser", "--datafolder=/config/" ] From b03e142f8b860d1ca5d6cea9e09802a412e87d13 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 08:34:39 +0000 Subject: [PATCH 06/49] modified: Dockerfile Updated NZBhydra port in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c1df2f6..7ce092b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN addgroup -g $MED_GID $MED_GROUP RUN adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER RUN chown -R $MED_USER:$MED_GROUP /nzbhydra -EXPOSE 5075 +EXPOSE 5076 USER $MED_USER From 05a65170c607fdb3f7013de88b8eba2769158580 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 08:43:17 +0000 Subject: [PATCH 07/49] modified: Dockerfile Added python3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7ce092b..ccf36b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ENV LANG='en_US.UTF-8' \ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk update && \ apk -U upgrade && \ - apk -U add python + apk -U add python python3 RUN echo $VERSION RUN wget https://github.com/theotherp/nzbhydra2/archive/v$VERSION.tar.gz -O nzbhydra.tar.gz From 36ad5b8aa248d9a77dc412f0d4bc4bfe28aa0d7c Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 08:47:25 +0000 Subject: [PATCH 08/49] modified: Dockerfile Run from the wrapper directory --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ccf36b0..23dd975 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,8 @@ RUN chown -R $MED_USER:$MED_GROUP /nzbhydra EXPOSE 5076 +WORKDIR /nzbhydra/other/wrapper +VOLUME /config USER $MED_USER -CMD [ "/usr/bin/python3", "/nzbhydra/other/wrapper/nzbhydra2wrapperPy3.py", "--nobrowser", "--datafolder=/config/" ] +CMD [ "/usr/bin/python3", "nzbhydra2wrapperPy3.py", "--nobrowser", "--datafolder=/config/" ] From dbb5d290952ee138ef61649b844a296bb6988390 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 09:07:17 +0000 Subject: [PATCH 09/49] modified: Dockerfile Added java and unzip --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 23dd975..502bfa3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,14 +16,15 @@ ENV LANG='en_US.UTF-8' \ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk update && \ apk -U upgrade && \ - apk -U add python python3 + apk -U add openjdk11-jre-headless unzip python3 RUN echo $VERSION -RUN wget https://github.com/theotherp/nzbhydra2/archive/v$VERSION.tar.gz -O nzbhydra.tar.gz -RUN tar zxvf nzbhydra.tar.gz -RUN mv nzbhydra2-$VERSION nzbhydra -RUN rm -rf nzbhydra.tar.gz -RUN apk del make gcc g++ +RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v$VERSION/nzbhydra2-$VERSION-linux.zip -O nzbhydra.zip +RUN mkdir /nzbhydra +RUN cd /nzbhydra +RUN unzip nzbhydra.zip +RUN chmod 755 nzbhydra2 +RUN rm -rf /nzbhydra.zip RUN rm -rf /tmp/src RUN rm -rf /var/cache/apk/* RUN addgroup -g $MED_GID $MED_GROUP From f2d1c18579f22c2ee6935814ac0ad91a731276e5 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 09:14:19 +0000 Subject: [PATCH 10/49] modified: Dockerfile Corrected WORKDIR parameter --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 502bfa3..6037aac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ RUN chown -R $MED_USER:$MED_GROUP /nzbhydra EXPOSE 5076 -WORKDIR /nzbhydra/other/wrapper +WORKDIR /nzbhydra VOLUME /config USER $MED_USER From d086e9e0fce33450c430654c9649acc527f7341e Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 09:16:08 +0000 Subject: [PATCH 11/49] modified: Dockerfile Used absolute directory for nzbhydrawrapper location --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6037aac..a1df435 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,4 +37,4 @@ WORKDIR /nzbhydra VOLUME /config USER $MED_USER -CMD [ "/usr/bin/python3", "nzbhydra2wrapperPy3.py", "--nobrowser", "--datafolder=/config/" ] +CMD [ "/usr/bin/python3", "/nzbhydra/nzbhydra2wrapperPy3.py", "--nobrowser", "--datafolder=/config/" ] From 5f4b29b3380cae50cbcbb42bd6ef7c35e55b77a2 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 09:20:53 +0000 Subject: [PATCH 12/49] modified: Dockerfile Fixed unzip to nzbhydra directory --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a1df435..fd300cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN echo $VERSION RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v$VERSION/nzbhydra2-$VERSION-linux.zip -O nzbhydra.zip RUN mkdir /nzbhydra RUN cd /nzbhydra -RUN unzip nzbhydra.zip +RUN unzip ..//nzbhydra.zip RUN chmod 755 nzbhydra2 RUN rm -rf /nzbhydra.zip RUN rm -rf /tmp/src From 263d0c027b68ec7661e0af8710be340c69a99ed6 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 09:28:31 +0000 Subject: [PATCH 13/49] modified: Dockerfile Adjusted unzip command to extract to specific directory --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd300cf..cd14b28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,9 +21,8 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie RUN echo $VERSION RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v$VERSION/nzbhydra2-$VERSION-linux.zip -O nzbhydra.zip RUN mkdir /nzbhydra -RUN cd /nzbhydra -RUN unzip ..//nzbhydra.zip -RUN chmod 755 nzbhydra2 +RUN unzip /nzbhydra.zip -d /nzbhydra +RUN chmod 755 /nzbhydra/nzbhydra2 RUN rm -rf /nzbhydra.zip RUN rm -rf /tmp/src RUN rm -rf /var/cache/apk/* @@ -37,4 +36,4 @@ WORKDIR /nzbhydra VOLUME /config USER $MED_USER -CMD [ "/usr/bin/python3", "/nzbhydra/nzbhydra2wrapperPy3.py", "--nobrowser", "--datafolder=/config/" ] +CMD [ "/usr/bin/python3", "nzbhydra2wrapperPy3.py", "--nobrowser", "--datafolder=/config/" ] From bf63a2ed07ed92d8d86af1d7304b377fe4ace9fc Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Thu, 20 Feb 2020 01:35:13 +0000 Subject: [PATCH 14/49] modified: Dockerfile Bumped to version 2.13.14 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cd14b28..20771f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.13.13' \ + VERSION='2.13.14' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ From 47dabc8c1758c311f100d1b56ade831ea87a6f60 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Mon, 24 Feb 2020 04:04:04 +0000 Subject: [PATCH 15/49] modified: Dockerfile Updated to version 2.14.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 20771f6..9b5653d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.13.14' \ + VERSION='2.14.1' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ From c0afad343d7ed37351120e4ba401411817ef74d6 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 10 Mar 2020 16:35:00 +0800 Subject: [PATCH 16/49] modified: Dockerfile Bumped to version 2.14.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9b5653d..9b409bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.14.1' \ + VERSION='2.14.2' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ From aeca4ec56b4f142bc2ce82a2d08157ad155a6709 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 10 Mar 2020 16:52:55 +0800 Subject: [PATCH 17/49] modified: Jenkinsfile Added code to automatically deploy builds to k8s --- Jenkinsfile | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c17c8e9..8e2dc07 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,12 +6,22 @@ node("docker-node") { sh "git rev-parse HEAD > .git/commit-id" def commit_id = readFile('.git/commit-id').trim() println commit_id + + try { + stage "build" + def app = docker.build "library/x86_64/alpine/nzbhydra2" - stage "build" - def app = docker.build "library/x86_64/alpine/nzbhydra2" - - stage "publish" - app.push("${env.BUILD_NUMBER}") - app.push("latest") + stage "publish" + app.push("${env.BUILD_NUMBER}") + app.push("latest") + + stage('Deploy on K8s'){ + sh "/usr/local/bin/kubectl -n media delete po nzbhydra-0" + } + } + catch (err) { + currentBuild.result = 'FAILURE' + } } } + From 4a6a19f6bdffa33b2ebf6007818fdb97959527c7 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 10 Mar 2020 17:06:57 +0800 Subject: [PATCH 18/49] modified: README.md Bumped to rebuild --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f88772b..679ab9b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # x86_64-alpine-nzbhydra -NZBhydra index searcher running on Alpine Linux container image \ No newline at end of file +NZBhydra index searcher running on Alpine Linux container image +- Bumped to version 2 From d2c7af0d3628171da0c1905b3131e9bc29e2e810 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Mon, 23 Mar 2020 12:50:27 +0800 Subject: [PATCH 19/49] modified: Dockerfile modified: Jenkinsfile Bumped to nzbhydra2 2.16.2 --- Dockerfile | 2 +- Jenkinsfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9b409bf..591dda3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.14.2' \ + VERSION='2.16.2' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 8e2dc07..500e5c0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,6 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") + app.push("2.16.2") app.push("latest") stage('Deploy on K8s'){ From 2f16ccdd90cc2472eaf1a1c00a66260da2337378 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Mon, 23 Mar 2020 14:39:30 +0000 Subject: [PATCH 20/49] modified: Dockerfile Bumped to version 2.16.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 591dda3..ebb9306 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.16.2' \ + VERSION='2.16.3' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ From 92dbb9239e6b038581db0035014851032ff16635 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 24 Mar 2020 09:08:09 +0800 Subject: [PATCH 21/49] modified: Dockerfile Bumped to version 2.16.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ebb9306..19b8c81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.16.3' \ + VERSION='2.16.4' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ From 5da7791bc2cd74b8e8a3a2dc0f66d3a7d295ad25 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 31 Mar 2020 08:31:40 +0800 Subject: [PATCH 22/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.17.0 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 19b8c81..17b349f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.16.4' \ + VERSION='2.17.0' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 500e5c0..ebe2fa6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.16.2") + app.push("2.17.0") app.push("latest") stage('Deploy on K8s'){ From d9202e7eb74839d29a1d2254be710d48d44c80da Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Wed, 1 Apr 2020 09:42:45 +0800 Subject: [PATCH 23/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.17.1 --- Dockerfile | 2 +- Jenkinsfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17b349f..8a91c0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.17.0' \ + VERSION='2.17.1' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index ebe2fa6..8052734 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,8 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.17.0") + app.push("2.17.1") + app.push("2") app.push("latest") stage('Deploy on K8s'){ From 8a011000203a5041608e6cf60fafa3a29c14462b Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Wed, 1 Apr 2020 17:34:24 +0800 Subject: [PATCH 24/49] modified: Dockerfile modified: Jenkinsfile Bumped to 2.17.2 and removed some RUN commands to reduce image layers --- Dockerfile | 21 ++++++++++----------- Jenkinsfile | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8a91c0e..e9aed10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.17.1' \ + VERSION='2.17.2' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ @@ -18,16 +18,15 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie apk -U upgrade && \ apk -U add openjdk11-jre-headless unzip python3 -RUN echo $VERSION -RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v$VERSION/nzbhydra2-$VERSION-linux.zip -O nzbhydra.zip -RUN mkdir /nzbhydra -RUN unzip /nzbhydra.zip -d /nzbhydra -RUN chmod 755 /nzbhydra/nzbhydra2 -RUN rm -rf /nzbhydra.zip -RUN rm -rf /tmp/src -RUN rm -rf /var/cache/apk/* -RUN addgroup -g $MED_GID $MED_GROUP -RUN adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER +RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v$VERSION/nzbhydra2-$VERSION-linux.zip -O nzbhydra.zip && \ + mkdir /nzbhydra && \ + unzip /nzbhydra.zip -d /nzbhydra && \ + chmod 755 /nzbhydra/nzbhydra2 && \ + rm -rf /nzbhydra.zip && \ + rm -rf /tmp/src && \ + rm -rf /var/cache/apk/* && \ +RUN addgroup -g $MED_GID $MED_GROUP && \ + adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER RUN chown -R $MED_USER:$MED_GROUP /nzbhydra EXPOSE 5076 diff --git a/Jenkinsfile b/Jenkinsfile index 8052734..231d1d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.17.1") + app.push("2.17.2") app.push("2") app.push("latest") From e0475f753f4941d7cf6648e760cd3a9a45435c31 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Thu, 2 Apr 2020 15:56:09 +0800 Subject: [PATCH 25/49] modified: Dockerfile Fixed some typos --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e9aed10..0f49ecd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,9 +22,7 @@ RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v$VERSION/nzbh mkdir /nzbhydra && \ unzip /nzbhydra.zip -d /nzbhydra && \ chmod 755 /nzbhydra/nzbhydra2 && \ - rm -rf /nzbhydra.zip && \ - rm -rf /tmp/src && \ - rm -rf /var/cache/apk/* && \ + rm -rf /nzbhydra.zip /tmp/src /var/cache/apk/* RUN addgroup -g $MED_GID $MED_GROUP && \ adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER RUN chown -R $MED_USER:$MED_GROUP /nzbhydra From 7ef13a611195bbcc4399d30c85dc546f03124418 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Thu, 2 Apr 2020 15:59:29 +0800 Subject: [PATCH 26/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.17.3 --- Dockerfile | 2 +- Jenkinsfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0f49ecd..375eaaf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.17.2' \ + VERSION='2.17.3' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 231d1d7..0faafd6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,8 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.17.2") + app.push("2.17.3") + app.push("2.17") app.push("2") app.push("latest") From 0773996a48c58378a7aabe09d565e1e5a56b7a1c Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Mon, 6 Apr 2020 10:51:15 +0800 Subject: [PATCH 27/49] modified: Dockerfile modified: Jenkinsfile Updated NZBhydra to 2.17.4 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 375eaaf..a2fad36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.17.3' \ + VERSION='2.17.4' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 0faafd6..1dfbd82 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.17.3") + app.push("2.17.4") app.push("2.17") app.push("2") app.push("latest") From fcdaf0190f0bee5c54d67b965431cb321883ca46 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Mon, 6 Apr 2020 14:23:07 +0800 Subject: [PATCH 28/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.17.5 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2fad36..8ff1844 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.17.4' \ + VERSION='2.17.5' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 1dfbd82..667caac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.17.4") + app.push("2.17.5") app.push("2.17") app.push("2") app.push("latest") From aacd7ed939e8646185b596b3991f6e000e1d3dec Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Fri, 17 Apr 2020 22:23:19 +0800 Subject: [PATCH 29/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.17.6 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8ff1844..4def099 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.17.5' \ + VERSION='2.17.6' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 667caac..3a74e63 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.17.5") + app.push("2.17.6") app.push("2.17") app.push("2") app.push("latest") From cda9cac8faefb6a3585e9d8d2b94ad9ab99d56f6 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 21 Apr 2020 11:53:55 +0800 Subject: [PATCH 30/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.19.5 --- Dockerfile | 2 +- Jenkinsfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4def099..e267353 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.17.6' \ + VERSION='2.19.5' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 3a74e63..a0b17cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,8 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.17.6") - app.push("2.17") + app.push("2.19.5") + app.push("2.19") app.push("2") app.push("latest") From fbee8fa29fcaa3ab950b872f09a8106eeb4021af Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Mon, 27 Apr 2020 14:09:24 +0800 Subject: [PATCH 31/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.19.6 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e267353..f2855dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.19.5' \ + VERSION='2.19.6' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index a0b17cd..70da88c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.19.5") + app.push("2.19.6") app.push("2.19") app.push("2") app.push("latest") From 50e186b54775022ea1009071777b7cd23f9aaf8b Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 28 Apr 2020 11:31:05 +0800 Subject: [PATCH 32/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.20.0 --- Dockerfile | 2 +- Jenkinsfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f2855dc..b5a9860 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.19.6' \ + VERSION='2.20.0' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 70da88c..71677bf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,8 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.19.6") - app.push("2.19") + app.push("2.20.0") + app.push("2.20") app.push("2") app.push("latest") From b402f1bf8cbd659c787249cf241bcc0f6f1f1481 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Wed, 29 Apr 2020 10:21:48 +0800 Subject: [PATCH 33/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.20.1 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b5a9860..885b46a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.20.0' \ + VERSION='2.20.1' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 71677bf..0662aa9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.20.0") + app.push("2.20.1") app.push("2.20") app.push("2") app.push("latest") From 4d26edd2daceb316ee85cc032b0fcf55379efac8 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Thu, 30 Apr 2020 20:55:27 +0800 Subject: [PATCH 34/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.20.2 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 885b46a..d0376f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.20.1' \ + VERSION='2.20.2' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 0662aa9..51f4104 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.20.1") + app.push("2.20.2") app.push("2.20") app.push("2") app.push("latest") From f491a3ea7c5de3b2595460d3ff922fe4481cf3f1 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Sat, 2 May 2020 16:24:03 +0800 Subject: [PATCH 35/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.20.3 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d0376f9..f4aec35 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.20.2' \ + VERSION='2.20.3' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 51f4104..ee4572f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.20.2") + app.push("2.20.3") app.push("2.20") app.push("2") app.push("latest") From 9103cabf22c88cee5cb0d6706a122f91c2fff96f Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Thu, 7 May 2020 09:42:46 +0800 Subject: [PATCH 36/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.20.4 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f4aec35..8453f83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.20.3' \ + VERSION='2.20.4' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index ee4572f..b853a02 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.20.3") + app.push("2.20.4") app.push("2.20") app.push("2") app.push("latest") From a11055dd42c1286bfd4b0a9d1883d85c5806297b Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Thu, 7 May 2020 09:56:20 +0800 Subject: [PATCH 37/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.20.5 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8453f83..262ba88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.20.4' \ + VERSION='2.20.5' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index b853a02..40700e7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.20.4") + app.push("2.20.5") app.push("2.20") app.push("2") app.push("latest") From 81b105df89f5cbd2a3f08a0fb7baadd333af88fc Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Thu, 7 May 2020 16:04:05 +0800 Subject: [PATCH 38/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.20.6 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 262ba88..e7f4866 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.20.5' \ + VERSION='2.20.6' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 40700e7..7930542 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.20.5") + app.push("2.20.6") app.push("2.20") app.push("2") app.push("latest") From 328edc8c771596f0189064c7bbbf0de5cbb393fd Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Fri, 8 May 2020 17:10:16 +0800 Subject: [PATCH 39/49] modified: Dockerfile modified: Jenkinsfile Bumped to 2.20.7 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e7f4866..115b692 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.20.6' \ + VERSION='2.20.7' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 7930542..e42e78b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.20.6") + app.push("2.20.7") app.push("2.20") app.push("2") app.push("latest") From a11d11f8914ff33bf040c2c512049c89418bd8d6 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Sat, 9 May 2020 11:53:22 +0800 Subject: [PATCH 40/49] modified: Dockerfile modified: Jenkinsfile Bumped to versnio 2.21.0 --- Dockerfile | 2 +- Jenkinsfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 115b692..a945eb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.20.7' \ + VERSION='2.21.0' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index e42e78b..0fafd90 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,8 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.20.7") - app.push("2.20") + app.push("2.21.0") + app.push("2.21") app.push("2") app.push("latest") From bece1c9b5724491af018fa2adf262442259a5204 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Sun, 10 May 2020 15:14:33 +0800 Subject: [PATCH 41/49] modified: Dockerfile modified: Jenkinsfile Bumped to versnio 2.21.1 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a945eb9..ac5bcad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.21.0' \ + VERSION='2.21.1' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 0fafd90..2eae6f3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.21.0") + app.push("2.21.1") app.push("2.21") app.push("2") app.push("latest") From 019d1e1dc4808ccbb8c992123bd95ee03ff17205 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Sat, 16 May 2020 11:36:54 +0800 Subject: [PATCH 42/49] modified: Dockerfile modified: Jenkinsfile Bumped to v2.22.1 --- Dockerfile | 2 +- Jenkinsfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac5bcad..076472b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.21.1' \ + VERSION='2.22.1' \ MED_USER='mediaservice' \ MED_GROUP='mediaservice' \ MED_UID='1003' \ diff --git a/Jenkinsfile b/Jenkinsfile index 2eae6f3..8628924 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,8 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.21.1") - app.push("2.21") + app.push("2.22.1") + app.push("2.22") app.push("2") app.push("latest") From ca4f0e58853be79e7d9c683ae0658f246edc9aa4 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Fri, 29 May 2020 00:03:42 +0800 Subject: [PATCH 43/49] modified: Dockerfile new file: start.sh Added startup script --- Dockerfile | 15 +++------------ start.sh | 8 ++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) create mode 100755 start.sh diff --git a/Dockerfile b/Dockerfile index 076472b..8745332 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.22.1' \ - MED_USER='mediaservice' \ - MED_GROUP='mediaservice' \ - MED_UID='1003' \ - MED_GID='1003' + VERSION='2.22.1' RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk update && \ @@ -23,14 +19,9 @@ RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v$VERSION/nzbh unzip /nzbhydra.zip -d /nzbhydra && \ chmod 755 /nzbhydra/nzbhydra2 && \ rm -rf /nzbhydra.zip /tmp/src /var/cache/apk/* -RUN addgroup -g $MED_GID $MED_GROUP && \ - adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER -RUN chown -R $MED_USER:$MED_GROUP /nzbhydra EXPOSE 5076 - -WORKDIR /nzbhydra +COPY start.sh /usr/local/bin/start.sh VOLUME /config -USER $MED_USER -CMD [ "/usr/bin/python3", "nzbhydra2wrapperPy3.py", "--nobrowser", "--datafolder=/config/" ] +CMD [ "/usr/local/bin/start.sh" ] diff --git a/start.sh b/start.sh new file mode 100755 index 0000000..ffeb1af --- /dev/null +++ b/start.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# +## Script to kick off NZBHydra2 searcher +# +addgroup -g $GID $USER +adduser -D -u $UID -G $USER -H $USER +chown -R $UID:$GID /nzbhydra +su - $USER -c "/usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder=/config/" From 7955ad82474e7accf0170da24e6dc9ea627f91e8 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Fri, 5 Jun 2020 00:04:00 +0800 Subject: [PATCH 44/49] modified: Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8628924..e6c2314 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ node("docker-node") { docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') { - git branch: "3.11.3", url: "ssh://git@git.ervine.org:2222/jonny/x86_64-alpine-nzbhydra", credentialsId: 'jenkins-to-git' + git branch: "3.11.6", url: "ssh://git@git.ervine.org/jonny/x86_64-alpine-nzbhydra", credentialsId: 'jenkins-to-git' sh "git rev-parse HEAD > .git/commit-id" def commit_id = readFile('.git/commit-id').trim() From 4f6f359524ec762efccb3354c016f2c7d1c48ec9 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Sat, 6 Jun 2020 21:33:32 +0800 Subject: [PATCH 45/49] modified: start.sh Fix working directory --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index ffeb1af..35c99d0 100755 --- a/start.sh +++ b/start.sh @@ -5,4 +5,4 @@ addgroup -g $GID $USER adduser -D -u $UID -G $USER -H $USER chown -R $UID:$GID /nzbhydra -su - $USER -c "/usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder=/config/" +su - $USER -c "cd /nzbhydra; /usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder=/config/" From 8312637602a81e1dd2e19e49a017c048428da451 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Mon, 8 Jun 2020 15:06:58 +0800 Subject: [PATCH 46/49] modified: Dockerfile modified: Jenkinsfile Bumped to version 2.23.0 --- Dockerfile | 2 +- Jenkinsfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8745332..46cd372 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.22.1' + VERSION='2.23.0' RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk update && \ diff --git a/Jenkinsfile b/Jenkinsfile index e6c2314..a7be426 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,8 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.22.1") - app.push("2.22") + app.push("2.23.0") + app.push("2.23") app.push("2") app.push("latest") From cd7b678f0c8250591d677c19c25cf16946e17c47 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 30 Jun 2020 09:41:22 +0800 Subject: [PATCH 47/49] Bumped to v.2.24.1 --- Dockerfile | 2 +- Jenkinsfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 46cd372..13db05d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.23.0' + VERSION='2.24.1' RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk update && \ diff --git a/Jenkinsfile b/Jenkinsfile index a7be426..7ee8a33 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,8 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.23.0") - app.push("2.23") + app.push("2.24.1") + app.push("2.24") app.push("2") app.push("latest") From d5f75f3fa79a3ff44b2b1ad68ce63a9c76c16343 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Fri, 3 Jul 2020 22:01:40 +0800 Subject: [PATCH 48/49] Bumped to version 2.25.0 --- Dockerfile | 2 +- Jenkinsfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13db05d..8f1dc81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' \ - VERSION='2.24.1' + VERSION='2.25.0' RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk update && \ diff --git a/Jenkinsfile b/Jenkinsfile index 7ee8a33..df10da2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,8 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("2.24.1") - app.push("2.24") + app.push("2.25.0") + app.push("2.25") app.push("2") app.push("latest") From da0ee7b28603850ffd1a0f80070d7b028dc019e4 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Mon, 20 Jul 2020 21:16:47 +0800 Subject: [PATCH 49/49] Use node bulder --- Jenkinsfile | 56 +++++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index df10da2..37229b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,30 +1,36 @@ -node("docker-node") { - docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') { - - git branch: "3.11.6", url: "ssh://git@git.ervine.org/jonny/x86_64-alpine-nzbhydra", credentialsId: 'jenkins-to-git' - - sh "git rev-parse HEAD > .git/commit-id" - def commit_id = readFile('.git/commit-id').trim() - println commit_id - try { - stage "build" - def app = docker.build "library/x86_64/alpine/nzbhydra2" - - stage "publish" - app.push("${env.BUILD_NUMBER}") - app.push("2.25.0") - app.push("2.25") - app.push("2") - app.push("latest") +podTemplate(yaml: """ +kind: Pod +spec: + containers: + - name: kaniko + image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251 + imagePullPolicy: Always + command: + - /busybox/cat + tty: true + volumeMounts: + - name: jenkins-docker-cfg + mountPath: /kaniko/.docker + volumes: + - name: jenkins-docker-cfg + projected: + sources: + - secret: + name: regcred + items: + - key: .dockerconfigjson + path: config.json +""" + ) { - stage('Deploy on K8s'){ - sh "/usr/local/bin/kubectl -n media delete po nzbhydra-0" - } - } - catch (err) { - currentBuild.result = 'FAILURE' - } + node(POD_LABEL) { + 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=true --destination=harbor.ervine.dev/library/x86_64/alpine/nzbhydra2:2.25.0 --destination=harbor.ervine.dev/library/x86_64/alpine/nzbhydra2:2.25 --destination=harbor.ervine.dev/library/x86_64/alpine/nzbget2:2' + } } + } }