diff --git a/Jenkinsfile b/Jenkinsfile index 39c843a04ae52172fed3c89bd45dc80a53dc9e0e..bb5f7d06a4a2c26f00b462e9fdebfd121c0b812a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,9 +14,7 @@ pipeline { //The container runtime (e.g. docker) that is used to do an image based build. If this is set then a container build is always done. QUARKUS_NATIVE_CONTAINER_RUNTIME = "podman" QUARKUS_CONTAINER_IMAGE_NAME = "user-manager" - QUARKUS_CONTAINER_IMAGE_ADDITIONAL_TAGS = "build-latest,snapshot-latest,latest" - QUARKUS_CONTAINER_IMAGE_GROUP = '' - QUARKUS_CONTAINER_IMAGE_REGISTRY = "docker.ozg-sh.de" + QUARKUS_CONTAINER_IMAGE_TAG = "build-latest" } options { @@ -73,24 +71,24 @@ pipeline { withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { //In einem Schritt - sh './mvnw -s $MAVEN_SETTINGS verify -Pnative -Dquarkus.container-image.push=true -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dmaven.wagon.http.retryHandler.count=3' + //sh './mvnw -s $MAVEN_SETTINGS verify -Pnative -Dquarkus.container-image.push=true -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dmaven.wagon.http.retryHandler.count=3' //In Seperaten Schritten - //sh 'podman login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}' - //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}' + 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 './mvnw -s $MAVEN_SETTINGS verify -Pnative -Dquarkus.native.reuse-existing=true' - //sh "podman tag docker.ozg-sh.de/user-manager:build-latest docker.ozg-sh.de/user-manager:${QUARKUS_CONTAINER_IMAGE_TAG}" - //sh "podman push docker.ozg-sh.de/user-manager:${QUARKUS_CONTAINER_IMAGE_TAG}" + sh "podman tag docker.ozg-sh.de/user-manager:build-latest docker.ozg-sh.de/user-manager:${QUARKUS_CONTAINER_IMAGE_TAG}" + sh "podman push docker.ozg-sh.de/user-manager:${QUARKUS_CONTAINER_IMAGE_TAG}" - //if (env.BRANCH_NAME == 'master') { - // sh 'podman push docker.ozg-sh.de/user-manager:snapshot-latest' - //} + if (env.BRANCH_NAME == 'master') { + sh 'podman push docker.ozg-sh.de/user-manager:snapshot-latest' + } - //if (env.BRANCH_NAME == 'release') { - // sh 'podman push docker.ozg-sh.de/user-manager:latest' - //} + if (env.BRANCH_NAME == 'release') { + sh 'podman push docker.ozg-sh.de/user-manager:latest' + } } } }