From 48e938660d6de2fd306164fd6e165d7525bc4407 Mon Sep 17 00:00:00 2001 From: ERIK Date: Fri, 13 May 2022 14:23:14 +0800 Subject: [PATCH] Allow replacement of address prefixes for all images (#8764) Signed-off-by: bo.jiang --- contrib/offline/README.md | 3 ++- contrib/offline/manage-offline-container-images.sh | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/offline/README.md b/contrib/offline/README.md index c5b44564c..6cf89d966 100644 --- a/contrib/offline/README.md +++ b/contrib/offline/README.md @@ -9,7 +9,8 @@ This script has two features: (2) Deploy local container registry and register the container images to the registry. Step(1) should be done online site as a preparation, then we bring the gotten images -to the target offline environment. +to the target offline environment. if images are from a private registry, +you need to set `PRIVATE_REGISTRY` environment variable. Then we will run step(2) for registering the images to local registry. Step(1) can be operated with: diff --git a/contrib/offline/manage-offline-container-images.sh b/contrib/offline/manage-offline-container-images.sh index 891441c5f..d81e42d65 100755 --- a/contrib/offline/manage-offline-container-images.sh +++ b/contrib/offline/manage-offline-container-images.sh @@ -54,7 +54,8 @@ function create_container_image_tar() { if [ "${FIRST_PART}" = "k8s.gcr.io" ] || [ "${FIRST_PART}" = "gcr.io" ] || [ "${FIRST_PART}" = "docker.io" ] || - [ "${FIRST_PART}" = "quay.io" ]; then + [ "${FIRST_PART}" = "quay.io" ] || + [ "${FIRST_PART}" = "${PRIVATE_REGISTRY}" ]; then image=$(echo ${image} | sed s@"${FIRST_PART}/"@@) fi echo "${FILE_NAME} ${image}" >> ${IMAGE_LIST} @@ -152,7 +153,8 @@ else echo "(2) Deploy local container registry and register the container images to the registry." echo "" echo "Step(1) should be done online site as a preparation, then we bring" - echo "the gotten images to the target offline environment." + echo "the gotten images to the target offline environment. if images are from" + echo "a private registry, you need to set PRIVATE_REGISTRY environment variable." echo "Then we will run step(2) for registering the images to local registry." echo "" echo "${IMAGE_TAR_FILE} is created to contain your container images."