Pull image, dann taggen und puschen

Jenkinsfile

@@ -71,23 +71,6 @@ pipeline {
 						withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
 							configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
 								sh './mvnw -s $MAVEN_SETTINGS clean package -DskipTests -Pnative -Dquarkus.container-image.registry=docker.ozg-sh.de -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dquarkus.container-image.push=true -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 docker.ozg-sh.de/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 docker.ozg-sh.de/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 docker.ozg-sh.de/root/user-manager:build-latest docker.ozg-sh.de/user-manager:latest'
-	                            	sh 'podman push docker.ozg-sh.de/user-manager:latest'
-	                            }
 							} 	
 						}
 					}    
@@ -107,20 +90,21 @@ pipeline {
                     container("quarkus-22") {
                         withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
                             sh 'podman login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
+							sh 'podman pull docker.ozg-sh.de/root/user-manager:build-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'
-                            //}
+							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 docker.ozg-sh.de/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 docker.ozg-sh.de/root/user-manager:build-latest docker.ozg-sh.de/user-manager:latest'
+                            	sh 'podman push docker.ozg-sh.de/user-manager:latest'
+                            }
                         }
                     }
                 }