fix build/push image WIP

Jenkinsfile

@@ -62,10 +62,32 @@ pipeline {
 				script {
 				    FAILED_STAGE=env.STAGE_NAME
 				    
+				    def pom = readMavenPom file: 'pom.xml'
+                    def version = pom.version
+                    
+                    BRANCH_AND_VERSION = "${env.BRANCH_NAME}-${version}"
+				    
 					container("quarkus-22"){
 						withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
 							configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
 								sh './mvnw -s $MAVEN_SETTINGS package -DskipTests -Pnative -Dquarkus.container-image.push=false -Dquarkus.container-image.build=true -Dmaven.wagon.http.retryHandler.count=3'
+								
+								sh 'podman login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
+								
+								echo "Version: ${BRANCH_AND_VERSION}";
+							
+								sh "podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:${BRANCH_AND_VERSION}"
+	                            sh "podman push docker.ozg-sh.de/user-manager:${BRANCH_AND_VERSION}"
+	                            
+	                            if (env.BRANCH_NAME == 'master') {
+	                            	sh 'podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:snapshot-latest'
+	                            	sh 'podman push docker.ozg-sh.de/user-manager:snapshot-latest'
+	                            }
+	
+	                            if (env.BRANCH_NAME == 'release') {
+	                            	sh 'podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:latest'
+	                            	sh 'podman push docker.ozg-sh.de/user-manager:latest'
+	                            }
 							} 	
 						}
 					}    
@@ -86,18 +108,19 @@ pipeline {
                         withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
                             sh 'podman login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
 							
-							sh "podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:${BRANCH_AND_VERSION}"
-                            sh "podman push docker.ozg-sh.de/user-manager:${BRANCH_AND_VERSION}"
-                            
-                            if (env.BRANCH_NAME == 'master') {
-                            	sh 'podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:snapshot-latest'
-                            	sh 'podman push docker.ozg-sh.de/user-manager:snapshot-latest'
-                            }
-
-                            if (env.BRANCH_NAME == 'release') {
-                            	sh 'podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:latest'
-                            	sh 'podman push docker.ozg-sh.de/user-manager:latest'
-                            }
+							echo "Version: ${BRANCH_AND_VERSION}";
+							//sh "podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:${BRANCH_AND_VERSION}"
+//                            sh "podman push docker.ozg-sh.de/user-manager:${BRANCH_AND_VERSION}"
+                            
+  //                          if (env.BRANCH_NAME == 'master') {
+                            	//sh 'podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:snapshot-latest'
+                            	//sh 'podman push docker.ozg-sh.de/user-manager:snapshot-latest'
+                            //}
+//
+                            //if (env.BRANCH_NAME == 'release') {
+//                            	sh 'podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:latest'
+                            	//sh 'podman push docker.ozg-sh.de/user-manager:latest'
+                            //}
                         }
                     }
                 }