From adc5ba63c93d2d67dd66275f0c86eda0b6b21d1a Mon Sep 17 00:00:00 2001 From: jonny Date: Tue, 9 Mar 2021 09:45:30 +0000 Subject: [PATCH 01/10] 'update files with ansible' --- Dockerfile | 22 +++++++--------------- Jenkinsfile | 5 +++-- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c42833..4f8a472 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +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:v.3.13 LABEL maintainer="Jonathan Ervine " # Install updates ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ - TERM='xterm' \ - VERSION='2.6.6' \ - TAUT_USER='tautulli' \ - TAUT_UID=1027 \ - TAUT_GID=1027 + TERM='xterm' RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk update && \ @@ -20,16 +16,12 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie ADD UTC /etc/localtime #RUN git clone https://github.com/Tautulli/Tautulli && \ -RUN wget https://github.com/Tautulli/Tautulli/archive/v$VERSION.tar.gz && \ - tar zxvf v$VERSION.tar.gz -C / && \ - mv /Tautulli-$VERSION /Tautulli && \ +RUN wget https://github.com/Tautulli/Tautulli/archive/v2.6.6.tar.gz && \ + tar zxvf v2.6.6.tar.gz -C / && \ + mv /Tautulli-2.6.6 /Tautulli && \ rm *.tar.gz && \ rm -rf /var/cache/apk/* && \ - addgroup -g $TAUT_GID $TAUT_USER && \ - adduser -D -u $TAUT_UID -G $TAUT_USER -H $TAUT_USER - -EXPOSE 8181 - -USER $TAUT_USER + addgroup -g 1027 tautulli && \ + adduser -D -u 1027 -G tautulli -H tautulli CMD [ "/usr/bin/python3", "/Tautulli/Tautulli.py", "--datadir", "/config", "--nofork", "--nolaunch" ] diff --git a/Jenkinsfile b/Jenkinsfile index fdc15f1..bfc8826 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,4 @@ + podTemplate(yaml: """ kind: Pod spec: @@ -27,11 +28,11 @@ spec: stage('Build with Kaniko') { git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-tautulli.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/tautulli:v2.6.6 --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6.6-3.13.1' } } stage('Notify gchat') { - hangoutsNotify message: "Tautulli 2.6.6 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "Tatutulli 2.6.6 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } } From 0eb07e3c7d78683f982177a770b965cd300aa96e Mon Sep 17 00:00:00 2001 From: jonny Date: Tue, 9 Mar 2021 12:55:03 +0000 Subject: [PATCH 02/10] 'update files with ansible' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4f8a472..a545ecd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base on latest (edge) alpine image -FROM harbor.ervine.dev/public/x86_64/alpine:v.3.13 +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.1 LABEL maintainer="Jonathan Ervine " From e4504ec18897b405fc07f193f1aed4aa4390590c Mon Sep 17 00:00:00 2001 From: jonny Date: Tue, 9 Mar 2021 12:59:08 +0000 Subject: [PATCH 03/10] 'update files with ansible' --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a545ecd..0802676 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.0 LABEL maintainer="Jonathan Ervine " diff --git a/Jenkinsfile b/Jenkinsfile index bfc8826..4f72987 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-tautulli.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/tautulli:v2.6.6-3.13.1' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6.6-3.13.0' } } stage('Notify gchat') { From 44872bf185b3dac1a9418c8b80a03d5985ef9494 Mon Sep 17 00:00:00 2001 From: jonny Date: Tue, 9 Mar 2021 13:02:47 +0000 Subject: [PATCH 04/10] 'update files with ansible' --- Dockerfile | 6 +++--- Jenkinsfile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0802676..07049f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,9 +16,9 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie ADD UTC /etc/localtime #RUN git clone https://github.com/Tautulli/Tautulli && \ -RUN wget https://github.com/Tautulli/Tautulli/archive/v2.6.6.tar.gz && \ - tar zxvf v2.6.6.tar.gz -C / && \ - mv /Tautulli-2.6.6 /Tautulli && \ +RUN wget https://github.com/Tautulli/Tautulli/archive/v2.6.7.tar.gz && \ + tar zxvf v2.6.7.tar.gz -C / && \ + mv /Tautulli-2.6.7 /Tautulli && \ rm *.tar.gz && \ rm -rf /var/cache/apk/* && \ addgroup -g 1027 tautulli && \ diff --git a/Jenkinsfile b/Jenkinsfile index 4f72987..f6ec807 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-tautulli.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/tautulli:v2.6.6-3.13.0' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6.7-3.13.0' } } stage('Notify gchat') { - hangoutsNotify message: "Tatutulli 2.6.6 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "Tatutulli 2.6.7 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } } From 4f884db4c328f11ce5a440ec58692a14ee826fe6 Mon Sep 17 00:00:00 2001 From: jonny Date: Tue, 9 Mar 2021 15:22:00 +0000 Subject: [PATCH 05/10] 'update files with ansible' --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f6ec807..930e614 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-tautulli.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/tautulli:v2.6.7-3.13.0' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6.7-3.13.1' } } stage('Notify gchat') { From 4b71573e012e903f2bc6efaaa058b10e94b46ccc Mon Sep 17 00:00:00 2001 From: jonny Date: Tue, 9 Mar 2021 15:26:08 +0000 Subject: [PATCH 06/10] 'update files with ansible' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 07049f5..bcfc6c6 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.0 +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.1 LABEL maintainer="Jonathan Ervine " From 699ed3d3105a04364f4732a229184df2610347d5 Mon Sep 17 00:00:00 2001 From: jonny Date: Tue, 9 Mar 2021 15:28:19 +0000 Subject: [PATCH 07/10] 'update files with ansible' --- Dockerfile | 6 +++--- Jenkinsfile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index bcfc6c6..101ae15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,9 +16,9 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie ADD UTC /etc/localtime #RUN git clone https://github.com/Tautulli/Tautulli && \ -RUN wget https://github.com/Tautulli/Tautulli/archive/v2.6.7.tar.gz && \ - tar zxvf v2.6.7.tar.gz -C / && \ - mv /Tautulli-2.6.7 /Tautulli && \ +RUN wget https://github.com/Tautulli/Tautulli/archive/v2.6.8.tar.gz && \ + tar zxvf v2.6.8.tar.gz -C / && \ + mv /Tautulli-2.6.8 /Tautulli && \ rm *.tar.gz && \ rm -rf /var/cache/apk/* && \ addgroup -g 1027 tautulli && \ diff --git a/Jenkinsfile b/Jenkinsfile index 930e614..f67b9dc 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-tautulli.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/tautulli:v2.6.7-3.13.1' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6.8-3.13.1' } } stage('Notify gchat') { - hangoutsNotify message: "Tatutulli 2.6.7 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "Tatutulli 2.6.8 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } } From b1b3744451037da3e9c0e80405c62ae6183aef92 Mon Sep 17 00:00:00 2001 From: jonny Date: Thu, 11 Mar 2021 14:52:59 +0000 Subject: [PATCH 08/10] 'update files with ansible' --- Dockerfile | 8 ++++---- Jenkinsfile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 101ae15..c37209d 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.0 LABEL maintainer="Jonathan Ervine " @@ -16,9 +16,9 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie ADD UTC /etc/localtime #RUN git clone https://github.com/Tautulli/Tautulli && \ -RUN wget https://github.com/Tautulli/Tautulli/archive/v2.6.8.tar.gz && \ - tar zxvf v2.6.8.tar.gz -C / && \ - mv /Tautulli-2.6.8 /Tautulli && \ +RUN wget https://github.com/Tautulli/Tautulli/archive/v2.6.6.tar.gz && \ + tar zxvf v2.6.6.tar.gz -C / && \ + mv /Tautulli-2.6.6 /Tautulli && \ rm *.tar.gz && \ rm -rf /var/cache/apk/* && \ addgroup -g 1027 tautulli && \ diff --git a/Jenkinsfile b/Jenkinsfile index f67b9dc..4f72987 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-tautulli.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/tautulli:v2.6.8-3.13.1' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6.6-3.13.0' } } stage('Notify gchat') { - hangoutsNotify message: "Tatutulli 2.6.8 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "Tatutulli 2.6.6 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } } From e5819d0599697a58ae7c2e6d76d45464313ed10d Mon Sep 17 00:00:00 2001 From: jonny Date: Wed, 31 Mar 2021 02:34:17 +0000 Subject: [PATCH 09/10] 'update files with ansible' --- Dockerfile | 8 ++++---- Jenkinsfile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c37209d..cb48285 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.0 +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.2:v3.13.2 LABEL maintainer="Jonathan Ervine " @@ -16,9 +16,9 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie ADD UTC /etc/localtime #RUN git clone https://github.com/Tautulli/Tautulli && \ -RUN wget https://github.com/Tautulli/Tautulli/archive/v2.6.6.tar.gz && \ - tar zxvf v2.6.6.tar.gz -C / && \ - mv /Tautulli-2.6.6 /Tautulli && \ +RUN wget https://github.com/Tautulli/Tautulli/archive/v2.6.10.tar.gz && \ + tar zxvf v2.6.10.tar.gz -C / && \ + mv /Tautulli-2.6.10 /Tautulli && \ rm *.tar.gz && \ rm -rf /var/cache/apk/* && \ addgroup -g 1027 tautulli && \ diff --git a/Jenkinsfile b/Jenkinsfile index 4f72987..ea9fd41 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-tautulli.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/tautulli:v2.6.6-3.13.0' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6.10-3.13.2' } } stage('Notify gchat') { - hangoutsNotify message: "Tatutulli 2.6.6 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "Tatutulli 2.6.10 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } } From 4e304a5cc5e35f4b06af3022d5aac78378bc6e37 Mon Sep 17 00:00:00 2001 From: jonny Date: Wed, 31 Mar 2021 04:12:05 +0000 Subject: [PATCH 10/10] 'update files with ansible' --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb48285..3ef0927 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:v3.13.2 +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.3:v3.13.3 LABEL maintainer="Jonathan Ervine " diff --git a/Jenkinsfile b/Jenkinsfile index ea9fd41..a18d2fe 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-tautulli.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/tautulli:v2.6.10-3.13.2' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6.10-3.13.3' } } stage('Notify gchat') {