Merge pull request #80047 from javier-b-perez/docker-name

release lib: docker save remove special name for amd64
This commit is contained in:
Kubernetes Prow Robot 2019-07-12 16:47:04 -07:00 committed by GitHub
commit 5f54216b08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -357,17 +357,7 @@ function kube::release::create_docker_images_for_server() {
local docker_build_path="${binary_dir}/${binary_name}.dockerbuild"
local docker_file_path="${docker_build_path}/Dockerfile"
local binary_file_path="${binary_dir}/${binary_name}"
local docker_image_tag="${docker_registry}"
if [[ ${arch} == "amd64" ]]; then
# If we are building a amd64 docker image, preserve the original
# image name
docker_image_tag+="/${binary_name}:${docker_tag}"
else
# If we are building a docker image for another architecture,
# append the arch in the image tag
docker_image_tag+="/${binary_name}-${arch}:${docker_tag}"
fi
local docker_image_tag="${docker_registry}/${binary_name}-${arch}:${docker_tag}"
kube::log::status "Starting docker build for image: ${binary_name}-${arch}"
(