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

---
 Dockerfile  | 17 +++++++----------
 Jenkinsfile |  4 ++--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e9f9940..5942cb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,14 @@
 # Base on latest (edge) alpine image
-FROM harbor.ervine.dev/library/x86_64/alpine:3.10.5
+FROM harbor.ervine.dev/public/x86_64/alpine:v3.10.5
 
-LABEL maintainer="Jonathan Ervine <docker@ervine.org>"
+LABEL maintainer="Jonathan Ervine docker@ervine.org"
 
 # Install updates
 # Create mediaservice user
 ENV LANG='en_US.UTF-8' \
     LANGUAGE='en_US.UTF-8' \
     BUILD_DATE='29-12-2020' \
-    TERM='xterm' \
-    WATCHER_USER=watcher \
-    WATCHER_UID=1027 \
-    WATCHER_GID=1027 
+    TERM='xterm' 
 
 RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
     apk update && \
@@ -22,12 +19,12 @@ ADD UTC /etc/localtime
 
 RUN git clone https://github.com/barbequesauce/watcher3 && \
     rm -rf /var/cache/apk/* && \
-    addgroup -g $WATCHER_GID $WATCHER_USER && \
-    adduser -D -u $WATCHER_UID -G $WATCHER_USER -H $WATCHER_USER && \
-    chown -R $WATCHER_UID:$WATCHER_GID /watcher3
+    addgroup -g 1027 watcher && \
+    adduser -D -u 1027 -G watcher -H watcherR && \
+    chown -R 1027:1027 /watcher3
 
 EXPOSE 9090
 
-USER $WATCHER_USER
+USER watcher
 
 CMD [ "/usr/bin/python3", "/watcher3/watcher.py", "--userdata=/config/", "-l /config/logs/" ]
diff --git a/Jenkinsfile b/Jenkinsfile
index 3fe9286..56242e2 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-watcher.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/watcher:v3.10.5-29122020 --destination=harbor.ervine.dev/public/x86_64/alpine/watcher:v3.10'
+        sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/watcher:v3.13.1'
       }
     }
     stage('Notify gchat') {