From c16c06d2ccd35f95da4ee6b21f99d93798b3aa02 Mon Sep 17 00:00:00 2001
From: jonny <git@ervine.org>
Date: Thu, 11 Mar 2021 15:17:29 +0000
Subject: [PATCH] 'update files with ansible'

---
 Dockerfile  | 18 +++++++-----------
 Jenkinsfile |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c465ffb..6746587 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,24 @@
 # 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 <docker@ervine.org>"
+LABEL Maintainer="Jonathan Ervine docker@ervine.org"
 LABEL build-date="02 10 2020"
 
 # Install updates
 ENV LANG='en_US.UTF-8' \
     LANGUAGE='en_US.UTF-8' \
-    TERM='xterm' \
-    TORRENT_USER='torrent' \
-    TORRENT_UID='1027' \
-    TORRENT_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 \
-    transmission-daemon && \
+  apk -U add transmission-daemon && \
   wget https://github.com/Secretmapper/combustion/archive/release.zip && \
   unzip release.zip && \
   mv combustion-release/* /usr/share/transmission/web/ && \
   rmdir combustion-release && \
-  addgroup -g $TORRENT_GID $TORRENT_USER && \
-  adduser -D -u $TORRENT_UID -G $TORRENT_USER -H $TORRENT_USER && \
+  addgroup -g 1027 torrent && \
+  adduser -D -u 1027 -G torrent -H torrent && \
   rm release.zip
 
 RUN rm -rf /var/cache/apk/* 
@@ -31,6 +27,6 @@ EXPOSE 9091 56451 56451/udp
 
 VOLUME /config
 
-#USER $TORRENT_USER
+#USER torrent
 
 CMD [ "/usr/bin/transmission-daemon", "-f", "-g", "/config/" ]
diff --git a/Jenkinsfile b/Jenkinsfile
index c745872..2aa2eae 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,7 @@ 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,7 +27,7 @@ spec:
     stage('Build with Kaniko') {
       git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-transmission.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/transmission:v3.13 --destination=harbor.ervine.dev/public/x86_64/alpine/transmission:v3.13.0'
+        sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine//transmission:v3.13.1'
       }
     }
     stage('Notify gchat') {