OZG-4786 OZG-4792 Assign docker image tag when built

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)
 

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>