From f20eef8875d2481ce92546f14870f9509e63cde2 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 17 Jan 2024 09:53:01 +0100
Subject: [PATCH] OZG-4786 OZG-4792 Take correct username and password to push
dockerfiles (Jenkins)
---
Jenkinsfile | 5 ++++-
pom.xml | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 07a5865d..3d734796 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -75,8 +75,11 @@ pipeline {
FAILED_STAGE=env.STAGE_NAME
}
+
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -Dbuildtag=$IMAGE_TAG -Dspring-boot.build-image.publish=true'
+ 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 -Dbuildtag=$IMAGE_TAG -Dspring-boot.build-image.publish=true -Duser ${USER} -Dpassword ${PASSWORD}'
+ }
}
}
}
diff --git a/pom.xml b/pom.xml
index 3d0ccdb6..b7eea5de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,8 +69,8 @@
</image>
<docker>
<publishRegistry>
- <username>USER</username>
- <password>PASSWORD</password>
+ <username>${user}</username>
+ <password>${password}</password>
</publishRegistry>
</docker>
<excludes>
--
GitLab