Skip to content
Snippets Groups Projects
Commit 13342fc1 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4786 OZG-4792 Docker image tags when created

parent af004600
No related branches found
No related tags found
No related merge requests found
......@@ -75,7 +75,7 @@ pipeline {
}
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 -Dgit-version=${env.BRANCH_NAME} -Dversion=${PROJECTREVISION}'
}
}
}
......@@ -84,9 +84,9 @@ pipeline {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
IMAGE_TAG = generateImageTag()
// IMAGE_TAG = generateImageTag()
tagAndPushDockerImage(IMAGE_TAG)
tagAndPushDockerImage("${env.BRANCH_NAME}-${PROJECTREVISION}")
if (env.BRANCH_NAME == 'master') {
tagAndPushDockerImage('snapshot-latest')
......@@ -174,7 +174,7 @@ Void tagAndPushDockerImage(String newTag){
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
sh "docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}"
sh "docker tag docker.ozg-sh.de/administration:build-latest docker.ozg-sh.de/administration:${newTag}"
// sh "docker tag docker.ozg-sh.de/administration:build-latest docker.ozg-sh.de/administration:${newTag}"
sh "docker push docker.ozg-sh.de/administration:${newTag}"
}
}
......
......@@ -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:${git-branch}-${version}</name>
</image>
<excludes>
<exclude>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment