From 70f75a6428e1e33e209977ab07dbd83850c8016a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 15 Jan 2024 17:50:21 +0100
Subject: [PATCH] OZG-4786 OZG-4792 Assign docker image tag when built
---
Jenkinsfile | 5 +++--
pom.xml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index adf27755..daddb80a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -72,10 +72,11 @@ pipeline {
steps {
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'
+ sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -Dbuildtag=$IMAGE_TAG'
}
}
}
@@ -84,7 +85,7 @@ pipeline {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
- IMAGE_TAG = generateImageTag()
+
tagAndPushDockerImage(IMAGE_TAG)
diff --git a/pom.xml b/pom.xml
index 512c5b63..977addd0 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:build-latest</name>
+ <name>docker.ozg-sh.de/administration:${buildtag}</name>
</image>
<excludes>
<exclude>
--
GitLab