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

---
 Dockerfile  | 10 +++++-----
 Jenkinsfile | 11 +++++------
 2 files changed, 10 insertions(+), 11 deletions(-)
 mode change 100755 => 100644 Dockerfile
 mode change 100755 => 100644 Jenkinsfile

diff --git a/Dockerfile b/Dockerfile
old mode 100755
new mode 100644
index b970d44..66f60f8
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Base on latest (edge) alpine image
-FROM harbor.ervine.dev/public/x86_64/alpine:v3.13
-LABEL Maintainer="Jonathan Ervine <docker@ervine.org>"
+FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.1
+LABEL Maintainer="Jonathan Ervine docker@ervine.org"
 
 # Install updates
 ENV LANG='en_US.UTF-8' \
@@ -10,15 +10,15 @@ ENV LANG='en_US.UTF-8' \
 RUN apk update && \
     apk -U upgrade --ignore alpine-baselayout && \
     apk -U add python3 gcc py3-pip python3-dev musl-dev libffi-dev git && \
-    adduser -D python 
+    adduser -D hockey 
 
-RUN mkdir /data && cd /data && git clone --single-branch --branch master https://git.ervine.org/jonny/gcp-hockey-results /data
+RUN mkdir /idata && cd /data && git clone --single-branch --branch master https://git.ervine.org/jonny/gcp-hockey-results.git /data
 
 RUN pip3 install -r /data/requirements.txt && \
     rm -rf /tmp/src && rm -rf /var/cache/apk/* 
 
 EXPOSE 3000
 
-#USER python
+#USER hockey
 
 CMD [ "/usr/bin/python3", "/data/main.py" ]
diff --git a/Jenkinsfile b/Jenkinsfile
old mode 100755
new mode 100644
index 0d9fb58..7ee563e
--- 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,12 +27,11 @@ spec:
     stage('Build with Kaniko') {
       git branch: 'master', url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-hockey.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/hockey:v3.13.0 --destination=harbor.ervine.dev/public/x86_64/alpine/hockey:v3.13'
+        sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/public/x86_64/alpine//hockey:v3.13.1'
       }
     }
+    stage('Notify gchat') {
+      hangoutsNotify message: "Hockey Application on Alpine Linux 3.13.1 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
+    }
   }
 }
-
-stage('Notify gchat') {
-  hangoutsNotify message: "Hockey Application on Alpine Linux 3.13.0 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
-}