From 6e1eceba2f0f10e656a6b12c6903df9f7dfc014d Mon Sep 17 00:00:00 2001 From: MK13 Date: Sun, 18 Jan 2026 00:05:49 +0100 Subject: [PATCH] #26 Reenabled buildkit --- build/Dockerfile | 4 ---- build/Jenkinsfile | 30 ++++++++++++++---------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 0e0bf75..bf800f5 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,9 +1,5 @@ FROM eclipse-temurin:25-jre-alpine -# Create a non-root user for security -RUN addgroup -S spring && adduser -S spring -G spring -USER spring:spring - ARG JAR_FILE COPY ${JAR_FILE} app.jar diff --git a/build/Jenkinsfile b/build/Jenkinsfile index 6c908f7..e882980 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -61,24 +61,22 @@ pipeline { stage('Docker Build & Push') { steps { - withEnv(['DOCKER_BUILDKIT=0']) { - script { - def jarPath = sh(script: "ls target/checkout/web-container/target/*.jar | head -n 1", returnStdout: true).trim() - def releaseVer = sh(script: "pkgx mvn help:evaluate -Dexpression=project.version -q -DforceStdout -f target/checkout/web-container/pom.xml", returnStdout: true).trim() - def registry = env.DOCKER_REGISTRY.toLowerCase() - def registryHost = registry.replace("https://", "").replace("http://", "").replaceAll("/\$", "").toLowerCase() - def imageTag = "${registryHost}/nbscloud:${releaseVer}".toLowerCase() + script { + def jarPath = sh(script: "ls target/checkout/web-container/target/*.jar | head -n 1", returnStdout: true).trim() + def releaseVer = sh(script: "pkgx mvn help:evaluate -Dexpression=project.version -q -DforceStdout -f target/checkout/web-container/pom.xml", returnStdout: true).trim() + def registry = env.DOCKER_REGISTRY.toLowerCase() + def registryHost = registry.replace("https://", "").replace("http://", "").replaceAll("/\$", "").toLowerCase() + def imageTag = "${registryHost}/nbscloud:${releaseVer}".toLowerCase() - docker.withRegistry(registry, '') { - def customImage = docker.build(imageTag, "-f build/Dockerfile --build-arg JAR_FILE=${jarPath} .") + docker.withRegistry(registry, '') { + def customImage = docker.build(imageTag, "-f build/Dockerfile --build-arg JAR_FILE=${jarPath} .") - if (params.DRY_RUN) { - echo "DRY_RUN - do not push image to registry" - } - else { - customImage.push("${releaseVer}") - customImage.push("latest") - } + if (params.DRY_RUN) { + echo "DRY_RUN - do not push image to registry" + } + else { + customImage.push("${releaseVer}") + customImage.push("latest") } } }