diff --git a/Jenkinsfile b/Jenkinsfile index a4c66b8630e7fc3fe05d4887c3a78b333740cbaa..5ebb754d1a98753dd4da36530fe47d8b1a5e9fcb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -116,7 +116,7 @@ pipeline { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { - sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 $BUILD_PROFILE -Ddocker.publishRegistry.username=${USER} -Ddocker.publishRegistry.password=${PASSWORD} -Dbuild.number=$BUILD_NUMBER' + sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 $BUILD_PROFILE -Ddocker.publishRegistry.username=${USER} -Ddocker.publishRegistry.password=${PASSWORD} -Dbuild.number=$BUILD_NUMBER -DimageTag=$IMAGE_TAG -Dspring-boot.build-image.publish=true' } } } diff --git a/pom.xml b/pom.xml index 0dc310ccb39de6142440d20422576851de0ad52b..534424726a2f1cd2d62105110f83fd14113f4717 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ <properties> <imageName>docker.ozg-sh.de/administration</imageName> + <imageTag>build-latest</imageTag> <build.number>SET_BY_JENKINS</build.number> <spring-cloud-config-server.version>4.1.0</spring-cloud-config-server.version> <testcontainers-keycloak.version>3.2.0</testcontainers-keycloak.version> @@ -190,8 +191,8 @@ <artifactId>spring-boot-maven-plugin</artifactId> <configuration> <image> - <name>${imageName}:${env.BRANCH_NAME}-${project.version}</name> - <publish>true</publish> + <name>${imageName}:${imageTag}</name> + <publish>false</publish> </image> <docker> <publishRegistry>