From 463b61ae4ff8d6a1562debc9dd2c3d8b83a6d9ee Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 29 Jan 2024 10:55:52 +0100
Subject: [PATCH] OZG-4792 Added missing docker tag in pom.xml
---
Jenkinsfile | 2 +-
pom.xml | 30 ++++++++++++++++--------------
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a286db1c..fbaeac0b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -78,7 +78,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 -Duser=${USER} -Dpassword=${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}'
}
}
}
diff --git a/pom.xml b/pom.xml
index d0274c73..89d4a97d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,20 +96,22 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
- <image>
- <name>${imageName}:${env.BRANCH_NAME}-${project.version}</name>
- <publish>true</publish>
- </image>
- <publishRegistry>
- <username>${user}</username>
- <password>${password}</password>
- </publishRegistry>
- <excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
- </excludes>
+ <image>
+ <name>${imageName}:${env.BRANCH_NAME}-${project.version}</name>
+ <publish>true</publish>
+ </image>
+ <docker>
+ <publishRegistry>
+ <username>${docker.publishRegistry.username}</username>
+ <password>${docker.publishRegistry.password}</password>
+ </publishRegistry>
+ </docker>
+ <excludes>
+ <exclude>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
--
GitLab