github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

release: generate release docker tag with default values

Browse Source
This commit is contained in:
Javier Pérez Hernández 2019-07-16 09:10:00 -07:00
parent 12cf78e2d3
commit df60ae1917
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/lib/release.sh
View File

@ -385,9 +385,8 @@ EOF
"${DOCKER[@]}" build "${docker_build_opts[@]}" -q -t "${docker_image_tag}" "${docker_build_path}" >/dev/null "${DOCKER[@]}" build "${docker_build_opts[@]}" -q -t "${docker_image_tag}" "${docker_build_path}" >/dev/null
# If we are building an official/alpha/beta release we want to keep # If we are building an official/alpha/beta release we want to keep
# docker images and tag them appropriately. # docker images and tag them appropriately.
local release_docker_image_tag="" local -r release_docker_image_tag="${KUBE_DOCKER_REGISTRY-$docker_registry}/${binary_name}-${arch}:${KUBE_DOCKER_IMAGE_TAG-$docker_tag}"
if [[ -n "${KUBE_DOCKER_IMAGE_TAG-}" || -n "${KUBE_DOCKER_REGISTRY-}" ]]; then if [[ "${release_docker_image_tag}" != "${docker_image_tag}" ]]; then
release_docker_image_tag="${KUBE_DOCKER_REGISTRY-$docker_registry}/${binary_name}-${arch}:${KUBE_DOCKER_IMAGE_TAG-$docker_tag}"
kube::log::status "Tagging docker image ${docker_image_tag} as ${release_docker_image_tag}" kube::log::status "Tagging docker image ${docker_image_tag} as ${release_docker_image_tag}"
"${DOCKER[@]}" rmi "${release_docker_image_tag}" 2>/dev/null || true "${DOCKER[@]}" rmi "${release_docker_image_tag}" 2>/dev/null || true
"${DOCKER[@]}" tag "${docker_image_tag}" "${release_docker_image_tag}" 2>/dev/null "${DOCKER[@]}" tag "${docker_image_tag}" "${release_docker_image_tag}" 2>/dev/null
@ -397,11 +396,8 @@ EOF
rm -rf "${docker_build_path}" rm -rf "${docker_build_path}"
ln "${binary_dir}/${binary_name}.tar" "${images_dir}/" ln "${binary_dir}/${binary_name}.tar" "${images_dir}/"
if [[ -z "${KUBE_DOCKER_IMAGE_TAG-}" || -z "${KUBE_DOCKER_REGISTRY-}" ]]; then kube::log::status "Deleting docker image ${docker_image_tag}"
# not a release "${DOCKER[@]}" rmi "${docker_image_tag}" &>/dev/null || true
kube::log::status "Deleting docker image ${docker_image_tag}"
"${DOCKER[@]}" rmi "${docker_image_tag}" &>/dev/null || true
fi
) & ) &
done done