From cdf2c8bfb65f779f734dfcf6d2b865a54f20d7e5 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 15 Jan 2024 17:45:21 +0100
Subject: [PATCH] OZG-4786 OZG-4792 Revert to build on Jenkins
---
Jenkinsfile | 5 ++---
pom.xml | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 59d35845..adf27755 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -73,10 +73,9 @@ pipeline {
script {
FAILED_STAGE=env.STAGE_NAME
}
- IMAGE_TAG = generateImageTag()
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -Dtag=$IMAGE_TAG'
+ sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3'
}
}
}
@@ -175,7 +174,7 @@ Void tagAndPushDockerImage(String newTag){
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
sh "docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}"
- // sh "docker tag docker.ozg-sh.de/administration:build-latest docker.ozg-sh.de/administration:${newTag}"
+ sh "docker tag docker.ozg-sh.de/administration:build-latest docker.ozg-sh.de/administration:${newTag}"
sh "docker push docker.ozg-sh.de/administration:${newTag}"
}
}
diff --git a/pom.xml b/pom.xml
index 1a7c0938..512c5b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
- <name>docker.ozg-sh.de/administration:${tag}</name>
+ <name>docker.ozg-sh.de/administration:build-latest</name>
</image>
<excludes>
<exclude>
--
GitLab