From adc5ba63c93d2d67dd66275f0c86eda0b6b21d1a Mon Sep 17 00:00:00 2001
From: jonny <git@ervine.org>
Date: Tue, 9 Mar 2021 09:45:30 +0000
Subject: [PATCH] '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 <docker@ervine.org>"
 
 # 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
     }
   }
 }