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

---
 Dockerfile  | 12 +++++-------
 Jenkinsfile | 11 +++--------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1af8829..255a0e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,20 @@
 # 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
 
-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='0.5.10' 
-
+    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 python3
 
-RUN wget https://github.com/pymedusa/Medusa/archive/v$VERSION.tar.gz -O medusa.tar.gz && \
+RUN wget https://github.com/pymedusa/Medusa/archive/v0.5.9.tar.gz -O medusa.tar.gz && \
   tar zxvf medusa.tar.gz && \
-  mv Medusa-$VERSION medusa && \
+  mv Medusa-0.5.9 medusa && \
   rm -rf medusa.tar.gz && \
   apk del make gcc g++ && \
   rm -rf /tmp/src && \
diff --git a/Jenkinsfile b/Jenkinsfile
index 81c57d4..b6cdbd8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,8 +3,7 @@ kind: Pod
 spec:
   containers:
   - name: kaniko
-    #image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251
-    image: gcr.io/kaniko-project/executor:debug-v1.0.0
+    image: gcr.io/kaniko-project/executor:debug
     imagePullPolicy: Always
     command:
     - /busybox/cat
@@ -23,19 +22,15 @@ spec:
               path: config.json
 """
   ) {
-
   node(POD_LABEL) {
     stage('Build with Kaniko') {
-      environment {
-        MEDUSA_VER = "0.4.6"
-      }
       git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-medusa.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/medusa:0.5 --destination=harbor.ervine.dev/public/x86_64/alpine/medusa:v0.5.10"
+        sh "/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/public/x86_64/alpine/medusa:v0.5.9"
         }
     }
     stage('Notify gchat') {
-      hangoutsNotify message: "Medusa 0.5.10 on Alpine Linux has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
+      hangoutsNotify message: "Medusa 0.5.9 on Alpine Linux has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
     }
   }
 }