diff --git a/Jenkinsfile b/Jenkinsfile index adf2775528191228c7227f57f19ea10d84066e70..daddb80afea35f36537b747b98f1d1e67fb0f5bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,10 +72,11 @@ pipeline { steps { script { FAILED_STAGE=env.STAGE_NAME + IMAGE_TAG = generateImageTag() } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { - sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3' + sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -Dbuildtag=$IMAGE_TAG' } } } @@ -84,7 +85,7 @@ pipeline { steps { script { FAILED_STAGE=env.STAGE_NAME - IMAGE_TAG = generateImageTag() + tagAndPushDockerImage(IMAGE_TAG) diff --git a/pom.xml b/pom.xml index 512c5b63d450864f3f0b4e10742bc63e82be0a75..977addd06d03e111f1d0d34d57fa3c66e104862b 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ <artifactId>spring-boot-maven-plugin</artifactId> <configuration> <image> - <name>docker.ozg-sh.de/administration:build-latest</name> + <name>docker.ozg-sh.de/administration:${buildtag}</name> </image> <excludes> <exclude>