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

---
 Dockerfile  | 22 +++++++---------------
 Jenkinsfile |  7 ++++---
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 524eee0..6513ca1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,18 @@
 # 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"
 
 # Install updates
 ENV LANG='en_US.UTF-8' \
     LANGUAGE='en_US.UTF-8' \
     TERM='xterm' \
     VERSION='develop' \
-    SONARR_USER='sonarr' \
-    SONARR_GROUP='sonarr' \
-    SONARR_UID='1027' \
-    SONARR_GID='1027'
 
 RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
   apk -U update && \
   apk -U upgrade --ignore alpine-baselayout && \
-  apk -U add \
-    libmediainfo \
-    ca-certificates \
-    mono \
-    && \
+  apk -U add libmediainfo ca-certificates mono && \
   apk del make gcc g++ && \
   rm -rf /tmp/src && \
   rm -rf /var/cache/apk/*
@@ -28,12 +20,12 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie
 RUN wget https://update.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -O nzbdrone.tar.gz && \
   tar zxvf nzbdrone.tar.gz && \
   rm -rf nzbdrone.tar.gz && \
-  addgroup -g $SONARR_GID $SONARR_GROUP && \
-  adduser -D -u $SONARR_UID -G $SONARR_GROUP -H $SONARR_USER && \
-  chown -R $SONARR_USER:$SONARR_GROUP /NzbDrone
+  addgroup -g 1027 sonarr && \
+  adduser -D -u 1027 -G sonarr -H sonarr && \
+  chown -R sonarr:sonarr /NzbDrone
 
 EXPOSE 8989
 
-USER $SONARR_USER
+USER sonarr
 
 CMD [ "/usr/bin/mono", "--debug", "/NzbDrone/NzbDrone.exe", "--nobrowser", "--data=/config" ]
diff --git a/Jenkinsfile b/Jenkinsfile
index e63e746..aacc5a7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,9 +1,10 @@
+
 podTemplate(yaml: """
 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,11 +28,11 @@ spec:
     stage('Build with Kaniko') {
       git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-sonarr.git', credentialsId: 'jenkins-to-git'
       container('kaniko') {
-        sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:v2.0.0.5344 --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:v2'
+        sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:v2.0.0.5344-3.13.1'
       }
     }
     stage('Notify gchat') {
-      hangoutsNotify message: "Sonarr 2 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
+      hangoutsNotify message: "NZBget 2.0.0.5344 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
     }
   }
 }