Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-27 00:40:51 +01:00
Code Issues Packages Projects Releases Activity

Fix distribution call when calling without setting hotfix variable

Browse Source
This commit is contained in:
Laura Gorzitze
2024-06-18 10:52:14 +02:00
parent 25548e9f0a
commit 978aebf664
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scm-packaging/docker/build.gradle
View File

@@ -91,10 +91,8 @@ task setupBuilder() {
task build(type: Exec) {
commandLine = ["docker", "buildx", "bake", "--builder", "scm-builder", isSnapshot ? "dev": "prod"]
environment "VERSION", dockerTag
environment "COMMIT_SHA", revision
environment "IMAGE", dockerRepository
environment "IS_HOTFIX", isHotfix
setEnvironmentForDockerBuild({ String name, Object value -> environment(name, value) })
doLast {
File file = new File(project.buildDir, 'docker.tag')
@@ -105,10 +103,8 @@ task build(type: Exec) {
task pushImages(type: Exec) {
commandLine = ["docker", "buildx", "bake", "--builder", "scm-builder", isSnapshot ? "dev": "prod", "--push"]
environment "VERSION", dockerTag
environment "COMMIT_SHA", revision
environment "IMAGE", dockerRepository
environment "IS_HOTFIX", isHotfix
setEnvironmentForDockerBuild({ String name, Object value -> environment(name, value) })
dependsOn 'build'
}
@@ -145,3 +141,17 @@ license {
task check {
dependsOn checkLicenses
}
def setEnvironmentForDockerBuild(environment){
environment "VERSION", dockerTag
environment "COMMIT_SHA", revision
environment "IMAGE", dockerRepository
if (project.hasProperty("isHotfix")) {
environment "IS_HOTFIX", isHotfix
println("Setting hotfix to ${isHotfix}")
} else {
environment "IS_HOTFIX", true
println("'isHotfix'-Property not defined. Assuming hotfix release")
}
}