From 78aec355eae4ec4f12ddd107cd363e83a57fd134 Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Sun, 17 Nov 2024 20:46:58 +0100
Subject: [PATCH] using pipeline lib for building containers.

---
 Jenkinsfile | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ca7f5b2..bb4d083 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,29 +37,8 @@ pipeline {
     }
     stage('Build images') { 
       steps {
-        container('kaniko') { 
-          sh '''
-            /kaniko/executor \
-              --build-arg GOPROXY="$GOPROXY" \
-              --build-arg GOSUMDB="$GTOSUMDB" \
-              --registry-mirror wharf.wamblee.org \
-              --context=dir://. \
-              --dockerfile=Dockerfile.prod \
-              --destination=${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG} \
-              --destination=${REGISTRY}/${IMAGE_NAME}:${BRANCH_NAME}-latest
-            rm -rf /kaniko/*[0-9]* && rm -rf /kaniko/Dockerfile && mkdir -p /workspace
-          '''
-          sh '''
-            /kaniko/executor \
-              --build-arg GOPROXY="$GOPROXY" \
-              --build-arg GOSUMDB="$GTOSUMDB" \
-              --registry-mirror wharf.wamblee.org \
-              --context=dir://. \
-              --dockerfile=Dockerfile.test \
-              --destination=${REGISTRY}/${IMAGE_NAME}-test:${IMAGE_TAG} \
-              --destination=${REGISTRY}/${IMAGE_NAME}-test:${BRANCH_NAME}-latest
-          '''
-        }
+        buildcontainer(dockerfile: "Dockerfile.prod", image: env.IMAGE_NAME, tag: env.IMAGE_TAG)
+        buildcontainer(dockerfile: "Dockerfile.test", image: "${env.IMAGE_NAME}-test", tag: env.IMAGE_TAG)
       } 
     }
     stage('Integration test') {