OZG-4786 OZG-4792 Revived generateImageTag

Jenkinsfile

@@ -9,6 +9,7 @@ pipeline {
         BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/administration/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/"
         RELEASE_REGEX = /\d+.\d+.\d+/
         SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/
+        VERSION = getPomVersion('pom.xml')
         FAILED_STAGE = ""
         SH_SUCCESS_STATUS_CODE = 0
     }
@@ -73,9 +74,10 @@ 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 -Dgit-version=${env.BRANCH_NAME} -Dversion=${PROJECTREVISION}'
+                    sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -Dtag=$IMAGE_TAG'
                 }
            }
         }
@@ -84,9 +86,9 @@ pipeline {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
-                    // IMAGE_TAG = generateImageTag()
+                    IMAGE_TAG = generateImageTag()
 
-                    tagAndPushDockerImage("${env.BRANCH_NAME}-${PROJECTREVISION}")
+                    tagAndPushDockerImage($IMAGE_TAG)
 
                     if (env.BRANCH_NAME == 'master') {
                         tagAndPushDockerImage('snapshot-latest')

pom.xml

@@ -64,7 +64,7 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
                     <image>
-                        <name>docker.ozg-sh.de/administration:${git-branch}-${version}</name>
+                        <name>docker.ozg-sh.de/administration:${tag}</name>
                     </image>
 					<excludes>
 						<exclude>