mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
release lib: save release docker tag in tarfile
This commit is contained in:
parent
cf7662d3a1
commit
5e93584633
@ -393,22 +393,21 @@ EOF
|
|||||||
docker_build_opts+=("--pull")
|
docker_build_opts+=("--pull")
|
||||||
fi
|
fi
|
||||||
"${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
|
||||||
"${DOCKER[@]}" save "${docker_image_tag}" > "${binary_dir}/${binary_name}.tar"
|
|
||||||
echo "${docker_tag}" > "${binary_dir}/${binary_name}.docker_tag"
|
|
||||||
rm -rf "${docker_build_path}"
|
|
||||||
ln "${binary_dir}/${binary_name}.tar" "${images_dir}/"
|
|
||||||
|
|
||||||
# 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.
|
||||||
if [[ -n "${KUBE_DOCKER_IMAGE_TAG-}" && -n "${KUBE_DOCKER_REGISTRY-}" ]]; then
|
local release_docker_image_tag=""
|
||||||
local release_docker_image_tag="${KUBE_DOCKER_REGISTRY}/${binary_name}-${arch}:${KUBE_DOCKER_IMAGE_TAG}"
|
if [[ -n "${KUBE_DOCKER_IMAGE_TAG-}" && -n "${KUBE_DOCKER_REGISTRY-}" && $docker_registry != $KUBE_DOCKER_REGISTRY ]]; then
|
||||||
# Only rmi and tag if name is different
|
release_docker_image_tag="${KUBE_DOCKER_REGISTRY}/${binary_name}-${arch}:${KUBE_DOCKER_IMAGE_TAG}"
|
||||||
if [[ $docker_image_tag != $release_docker_image_tag ]]; then
|
|
||||||
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
|
||||||
fi
|
fi
|
||||||
else
|
"${DOCKER[@]}" save -o "${binary_dir}/${binary_name}.tar" "${docker_image_tag}" ${release_docker_image_tag}
|
||||||
|
echo "${docker_tag}" > "${binary_dir}/${binary_name}.docker_tag"
|
||||||
|
rm -rf "${docker_build_path}"
|
||||||
|
ln "${binary_dir}/${binary_name}.tar" "${images_dir}/"
|
||||||
|
|
||||||
|
if [[ -z "${KUBE_DOCKER_IMAGE_TAG-}" || -z "${KUBE_DOCKER_REGISTRY-}" ]]; then
|
||||||
# not a release
|
# not a release
|
||||||
kube::log::status "Deleting docker image ${docker_image_tag}"
|
kube::log::status "Deleting docker image ${docker_image_tag}"
|
||||||
"${DOCKER[@]}" rmi "${docker_image_tag}" &>/dev/null || true
|
"${DOCKER[@]}" rmi "${docker_image_tag}" &>/dev/null || true
|
||||||
|
Loading…
Reference in New Issue
Block a user