icecheng/freeleaps-ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove arch tag from image version

Browse Source 
- remove arch tag from image version
- use the same version for all architectures
- remove the `-linux-amd64` suffix from the image version
This commit is contained in:
icecheng 2025-10-09 15:25:31 +08:00
parent 47df3cdf84
commit 2d6c176950
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
View File

@ -128,13 +128,13 @@ class ImageBuilder {
architectures.each { architecture -> architectures.each { architecture ->
def archTag = architecture.split("/")[1] def archTag = architecture.split("/")[1]
steps.log.info("ImageBuilder", "Building image ${registry}/${repository}/${name} with architectures: ${architectures}, tag sets to ${version}") steps.log.info("ImageBuilder", "Building image ${registry}/${repository}/${name} with architectures: ${architectures}, tag sets to ${version}")
steps.sh "docker build -t ${registry}/${repository}/${name}:${version}-${archTag} --platform ${architecture} -f ${dockerfile} ${contextRoot}" steps.sh "docker build -t ${registry}/${repository}/${name}:${version} --platform ${architecture} -f ${dockerfile} ${contextRoot}"
steps.sh "docker push ${registry}/${repository}/${name}:${version}-${archTag}" steps.sh "docker push ${registry}/${repository}/${name}:${version}"
} }
steps.env.BUILD_IMAGE_REGISTRY = "${registry}" steps.env.BUILD_IMAGE_REGISTRY = "${registry}"
steps.env.BUILD_IMAGE_REPO = "${repository}" steps.env.BUILD_IMAGE_REPO = "${repository}"
steps.env.BUILD_IMAGE_NAME = "${name}" steps.env.BUILD_IMAGE_NAME = "${name}"
steps.env.BUILD_IMAGE_VERSION = "${version}-linux-amd64" steps.env.BUILD_IMAGE_VERSION = "${version}"
} }
} }
break break
@ -142,13 +142,13 @@ class ImageBuilder {
steps.dir(workspace) { steps.dir(workspace) {
architectures.each { architecture -> architectures.each { architecture ->
def archTag = architecture.split("/")[1] def archTag = architecture.split("/")[1]
steps.log.info("ImageBuilder", "Building image ${registry}/${repository}/${name} with architectures: ${architectures}, tag sets to ${version}-${archTag}") steps.log.info("ImageBuilder", "Building image ${registry}/${repository}/${name} with architectures: ${architectures}, tag sets to ${version}")
steps.sh "/kaniko/executor --log-format text --context ${contextRoot} --dockerfile ${dockerfile} --destination ${registry}/${repository}/${name}:${version}-${archTag} --custom-platform ${architecture}" steps.sh "/kaniko/executor --log-format text --context ${contextRoot} --dockerfile ${dockerfile} --destination ${registry}/${repository}/${name}:${version} --custom-platform ${architecture}"
} }
steps.env.BUILD_IMAGE_REGISTRY = "${registry}" steps.env.BUILD_IMAGE_REGISTRY = "${registry}"
steps.env.BUILD_IMAGE_REPO = "${repository}" steps.env.BUILD_IMAGE_REPO = "${repository}"
steps.env.BUILD_IMAGE_NAME = "${name}" steps.env.BUILD_IMAGE_NAME = "${name}"
steps.env.BUILD_IMAGE_VERSION = "${version}-linux-amd64" steps.env.BUILD_IMAGE_VERSION = "${version}"
} }
break break
default: default: