From 7f6304d37e36d4fb4441916c7f8fd3eb817b21d9 Mon Sep 17 00:00:00 2001
From: Jonathan Ervine <jonathan.ervine@gogotech.hk>
Date: Tue, 21 Jul 2020 22:34:12 +0800
Subject: [PATCH] Switch to node builer

---
 Dockerfile  | 19 ++++---------------
 Jenkinsfile | 48 +++++++++++++++++++++++++++++++++---------------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 861b55c..b28e8f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,17 @@
 # Base on latest (edge) alpine image
-FROM registry.ervine.dev/library/x86_64/alpine/alpine-3.11
+FROM registry.ervine.dev/library/x86_64/alpine/alpine:3.12
 
 MAINTAINER “Jonathan Ervine” <docker@ervine.org>
 
 # Install updates
 ENV LANG='en_US.UTF-8' \
     LANGUAGE='en_US.UTF-8' \
-    TERM='xterm' \
-    VERSION='0.3.2' \
-    MED_USER='mediaservice' \
-    MED_GROUP='mediaservice' \
-    MED_UID='1003' \
-    MED_GID='1003'
+    TERM='xterm' 
 
 RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
   apk update && \
-  apk -U upgrade && \
-  apk -U add \
-    python
+  apk -U upgrade --ignore alpein-baselayout && \
+  apk -U add python3
 
 RUN wget https://github.com/pymedusa/Medusa/archive/v$VERSION.tar.gz -O medusa.tar.gz && \
   tar zxvf medusa.tar.gz && \
@@ -26,12 +20,7 @@ RUN wget https://github.com/pymedusa/Medusa/archive/v$VERSION.tar.gz -O medusa.t
   apk del make gcc g++ && \
   rm -rf /tmp/src && \
   rm -rf /var/cache/apk/* && \
-  addgroup -g $MED_GID $MED_GROUP && \
-  adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER && \
-  chown -R $MED_USER:$MED_GROUP /medusa
 
 EXPOSE 8081
 
-USER $MED_USER
-
 CMD [ "/usr/bin/python", "/medusa/SickBeard.py", "--nolaunch", "--datadir=/config" ]
diff --git a/Jenkinsfile b/Jenkinsfile
index 663a8ba..1de8580 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,17 +1,35 @@
-node("docker-node") {
-    docker.withRegistry('https://harbor.ervine.org', credentials: 'jenkins-to-harbor') {
-    
-        git branch: "3.11.3", url: "ssh://git@git.ervine.org:2222/jonny/x86_64-alpine-muximux", credentialsId: 'jenkins-to-git'
-    
-        sh "git rev-parse HEAD > .git/commit-id"
-        def commit_id = readFile('.git/commit-id').trim()
-        println commit_id
-    
-        stage "build"
-        def app = docker.build "x86_64/alpine/muximux"
-    
-        stage "publish"
-        app.push("${env.BUILD_NUMBER}")
-        app.push("latest")
+podTemplate(yaml: """
+kind: Pod
+spec:
+  containers:
+  - name: kaniko
+    image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251
+    imagePullPolicy: Always
+    command:
+    - /busybox/cat
+    tty: true
+    volumeMounts:
+      - name: jenkins-docker-cfg
+        mountPath: /kaniko/.docker
+  volumes:
+  - name: jenkins-docker-cfg
+    projected:
+      sources:
+      - secret:
+          name: regcred
+          items:
+            - key: .dockerconfigjson
+              path: config.json
+"""
+  ) {
+
+  node(POD_LABEL) {
+    stage('Build with Kaniko') {
+      git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-muximux.git', credentialsId: 'jenkins-to-git'
+      container('kaniko') {
+        sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/library/x86_64/alpine/muximux:3.12'
+      }
     }
+  }
 }
+