From 8e44bd1c08dcc2301f72dd45026a825476e8f992 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 20 Mar 2024 10:59:28 +0100 Subject: [PATCH] Prevent latest docker tag for hotfix releases Pushed-by: Florian Scholdei Co-authored-by: Florian Scholdei Committed-by: Florian Scholdei --- Jenkinsfile | 6 +++++- scm-packaging/docker/build.gradle | 2 ++ scm-packaging/docker/docker-bake.hcl | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 203597e9f9..6cdcff8f8c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -120,7 +120,7 @@ pipeline { } steps { withPublishEnvironment { - gradle "-PenablePackaging publish" + gradle "-PenablePackaging publish -PisHotfix=${isHotfixBuild()}" } } } @@ -266,6 +266,10 @@ boolean isReleaseBuild() { return env.BRANCH_NAME.startsWith('release/') } +boolean isHotfixBuild() { + return env.BRANCH_NAME.startsWith('hotfix/') +} + String getReleaseVersion() { if (isReleaseBuild()) { return env.BRANCH_NAME.substring("release/".length()); diff --git a/scm-packaging/docker/build.gradle b/scm-packaging/docker/build.gradle index d0112691a9..918da0d3a5 100644 --- a/scm-packaging/docker/build.gradle +++ b/scm-packaging/docker/build.gradle @@ -94,6 +94,7 @@ task build(type: Exec) { environment "VERSION", dockerTag environment "COMMIT_SHA", revision environment "IMAGE", dockerRepository + environment "IS_HOTFIX", isHotfix doLast { File file = new File(project.buildDir, 'docker.tag') @@ -107,6 +108,7 @@ task pushImages(type: Exec) { environment "VERSION", dockerTag environment "COMMIT_SHA", revision environment "IMAGE", dockerRepository + environment "IS_HOTFIX", isHotfix dependsOn 'build' } diff --git a/scm-packaging/docker/docker-bake.hcl b/scm-packaging/docker/docker-bake.hcl index cda9b0346c..db0f010a0d 100644 --- a/scm-packaging/docker/docker-bake.hcl +++ b/scm-packaging/docker/docker-bake.hcl @@ -41,6 +41,10 @@ variable "IMAGE" { default = "docker.io/cloudogu/scm-manager" } +variable "IS_HOTFIX" { + default = false +} + target "base" { context = "." args = { @@ -69,7 +73,7 @@ target "alpine" { inherits = ["base"] dockerfile = "Dockerfile.alpine" tags = [ - "${IMAGE}:latest", + IS_HOTFIX ? "" : "${IMAGE}:latest", "${IMAGE}:${VERSION}", "${IMAGE}:${VERSION}-alpine" ]