From 04bf6f66b7754f0d9175072f7e70e1f80d6f66ed Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 2 Sep 2022 08:19:04 +0200
Subject: [PATCH] Pull image, dann taggen und puschen
---
Jenkinsfile | 40 ++++++++++++----------------------------
1 file changed, 12 insertions(+), 28 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index cd214fac..0d84b986 100644
--- a/Jenkinsfile
+++ b/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}"
+ 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'
- //}
+ 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'
+ }
}
}
}
--
GitLab