Skip to content

Commit

Permalink
avoids image name error when pulling from non-default registery
Browse files Browse the repository at this point in the history
when pulling from a non-default registery, you will have local image in full name include docker registery in it. But the whole pipeline works with DEFAULT behaviour when pulling from dockerhub that creates local image with image name only. This change, adds a tag to pulled local image with image_name only and avoids issue in continue. Also as a result of changes we do not need to clean `dockerImageDigest` later in the code. So that line removed.

Signed-off-by: [email protected]
  • Loading branch information
mahdipub committed Jun 24, 2024
1 parent d3d1287 commit f1195bf
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pipelines/build/common/openjdk_build_pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -2044,7 +2044,9 @@ class Build {
}
}
// Store the pulled docker image digest as 'buildinfo'
dockerImageDigest = context.sh(script: "docker inspect --format='{{.RepoDigests}}' ${buildConfig.DOCKER_IMAGE}", returnStdout:true)
def long_docker_image_name = context.sh(script: "docker image ls | grep ${buildConfig.DOCKER_IMAGE} | head -n1 | awk '{print \$1}'", returnStdout:true).trim()
context.sh(script: "docker tag '${long_docker_image_name}' '${buildConfig.DOCKER_IMAGE}'", returnStdout:false)
dockerImageDigest = context.sh(script: "docker inspect --format='{{index .RepoDigests 0}}' ${long_docker_image_name}", returnStdout:true)

// Use our dockerfile if DOCKER_FILE is defined
if (buildConfig.DOCKER_FILE) {
Expand Down Expand Up @@ -2078,7 +2080,6 @@ class Build {
)
}
} else {
dockerImageDigest = dockerImageDigest.replaceAll("\\[", "").replaceAll("\\]", "")
String dockerRunArg="-e \"BUILDIMAGESHA=$dockerImageDigest\""

// Are we running podman in Docker CLI Emulation mode?
Expand Down

0 comments on commit f1195bf

Please sign in to comment.