From a192eb75c4bd4e9e1accd22d36705d92d1c7d66e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 28 Feb 2024 11:46:44 +0100
Subject: [PATCH] OZG-5117 Refactored Jenkinsfile and pom to build image
locally
---
Jenkinsfile | 2 +-
pom.xml | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a4c66b86..5ebb754d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -116,7 +116,7 @@ pipeline {
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
- sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 $BUILD_PROFILE -Ddocker.publishRegistry.username=${USER} -Ddocker.publishRegistry.password=${PASSWORD} -Dbuild.number=$BUILD_NUMBER'
+ sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 $BUILD_PROFILE -Ddocker.publishRegistry.username=${USER} -Ddocker.publishRegistry.password=${PASSWORD} -Dbuild.number=$BUILD_NUMBER -DimageTag=$IMAGE_TAG -Dspring-boot.build-image.publish=true'
}
}
}
diff --git a/pom.xml b/pom.xml
index 0dc310cc..53442472 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
<properties>
<imageName>docker.ozg-sh.de/administration</imageName>
+ <imageTag>build-latest</imageTag>
<build.number>SET_BY_JENKINS</build.number>
<spring-cloud-config-server.version>4.1.0</spring-cloud-config-server.version>
<testcontainers-keycloak.version>3.2.0</testcontainers-keycloak.version>
@@ -190,8 +191,8 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
- <name>${imageName}:${env.BRANCH_NAME}-${project.version}</name>
- <publish>true</publish>
+ <name>${imageName}:${imageTag}</name>
+ <publish>false</publish>
</image>
<docker>
<publishRegistry>
--
GitLab