From d3289ffff363cb2905d2e223149dac52db5447b7 Mon Sep 17 00:00:00 2001
From: Hyatt <nhyatt@noreply.gitea.smoothnet.org>
Date: Tue, 30 Nov 2021 19:31:36 +0000
Subject: [PATCH] Update 'build-vlmcsd.jenkins'

---
 build-vlmcsd.jenkins | 47 +++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/build-vlmcsd.jenkins b/build-vlmcsd.jenkins
index 1075e9f..83df040 100644
--- a/build-vlmcsd.jenkins
+++ b/build-vlmcsd.jenkins
@@ -17,6 +17,11 @@ spec:
     tty: true
     command:
     - /busybox/cat
+  - name: alpine
+    image: ${repository}/library/alpine:latest
+    tty: true
+    command:
+    - /bin/sh
 """,
 ) {
 	node (label) {
@@ -50,9 +55,19 @@ spec:
                 ])
             }
 		}
+		
+		container ("alpine") {
+            stage ("Build VLMCSD") {
+                sh """
+                    apk --no-cache add gcc make musl-dev git
+                    cd "${workspace}/vlmcsd"
+                    make
+                """
+		    }
+		}
 
-		stage ("Prepare Kaniko") {
-			container ("kaniko") {
+		container ("kaniko") {
+            stage ("Prepare Kaniko") {
 				withCredentials([usernameColonPassword(
 					credentialsId: repositoryCreds,
 					variable: "dCreds",
@@ -70,33 +85,25 @@ spec:
 					"""
 				}
 			}
-		}
 
-		stage("Kaniko Build & Push") {
-			container ("kaniko") {
+            stage("Kaniko Build & Push") {
 				def dockerfile = """
-FROM registry.c.test-chamber-13.lan/library/alpine:latest as BUILDER
-
-RUN apk --no-cache add gcc && \\
-    cd ${workspace}/vlmcsd && \\
-    make
-
-FROM registry.c.test-chamber-13.lan/library/alpine:latest
-
-EXPOSE 1688/tcp
+FROM ${repository}/library/alpine:latest
 
 RUN addgroup -g 1000 -S vlmcsd && \\
     adduser -u 1000 -G vlmcsd -S -D -h /home/vlmcsd vlmcsd 
 
+COPY vlmcsd/bin/vlmcsd vlmcsd/etc/vlmcsd.kmd /home/vlmcsd
+
+EXPOSE 1688/tcp
+
 WORKDIR /home/vlmcsd
 
-COPY --from=build --chown=1000:1000 /vlmcsd/bin/vlmcsd /vlmcsd/etc/vlmcsd.kmd /home/vlmcsd/
-
-ENTRYPOINT ["/bin/sh" "-c" "./vlmcsd -L 0.0.0.0:1688 -m 5 -t 5 -e -N1 -B1 -r1 -C 1033 -R 1w -A 1h -H 36446 -v -D -j ./vlmcsd.kmd"]
+ENTRYPOINT ["/bin/sh", "-c", "./vlmcsd -L 0.0.0.0:1688 -m 5 -t 5 -e -N1 -B1 -r1 -C 1033 -R 1w -A 1h -H 36446 -v -D -j ./vlmcsd.kmd"]
 """
-				writeFile (file: workspace + "/Dockerfile", text: dockerfile)
-				sh "/kaniko/executor --context \"${workspace}\" -f \"${workspace}/Dockerfile\" --destination \"${repository}/library/vlmcsd:latest\""
-			}
+                writeFile (file: workspace + "/Dockerfile", text: dockerfile)
+                sh "/kaniko/executor --context \"${workspace}\" -f \"${workspace}/Dockerfile\" --destination \"${repository}/library/vlmcsd:latest\""
+            }
 		}
 	}
 }
\ No newline at end of file