From 323b3b9c1158094da636622727eb18bec856959b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 28 Feb 2024 12:05:12 +0100
Subject: [PATCH] OZG-5117 modified Jenkinsfile and pom to push image

---
 Jenkinsfile | 2 +-
 pom.xml     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5ebb754d..8028deca 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 -DimageTag=$IMAGE_TAG -Dspring-boot.build-image.publish=true'
+                        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 -DpublishImage=true'
                     }
                 }
             }
diff --git a/pom.xml b/pom.xml
index 53442472..60a6b290 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,7 @@
 	<properties>
 		<imageName>docker.ozg-sh.de/administration</imageName>
 		<imageTag>build-latest</imageTag>
+		<publishImage>false</publishImage>
 		<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>
@@ -192,7 +193,7 @@
 				<configuration>
 				<image>
 					<name>${imageName}:${imageTag}</name>
-					<publish>false</publish>
+					<publish>${publishImage}</publish>
 				</image>
 				<docker>
 					<publishRegistry>
-- 
GitLab