Merge pull request #99080 from vinayakankugoyal/dockerfile3

Use docker buildx for the build-image.
This commit is contained in:
Kubernetes Prow Robot 2021-06-05 11:46:38 -07:00 committed by GitHub
commit aaceb26ea3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -397,11 +397,11 @@ function kube::build::docker_build() {
local build_args
IFS=" " read -r -a build_args <<< "$4"
readonly build_args
local -ra build_cmd=("${DOCKER[@]}" build -t "${image}" "--pull=${pull}" "${build_args[@]}" "${context_dir}")
local -ra build_cmd=("${DOCKER[@]}" buildx build --load -t "${image}" "--pull=${pull}" "${build_args[@]}" "${context_dir}")
kube::log::status "Building Docker image ${image}"
local docker_output
docker_output=$("${build_cmd[@]}" 2>&1) || {
docker_output=$(DOCKER_CLI_EXPERIMENTAL=enabled "${build_cmd[@]}" 2>&1) || {
cat <<EOF >&2
+++ Docker build command failed for ${image}
@ -409,7 +409,7 @@ ${docker_output}
To retry manually, run:
${build_cmd[*]}
DOCKER_CLI_EXPERIMENTAL=enabled ${build_cmd[*]}
EOF
return 1