diff --git a/dockerfiles/base/scripts/base/commands/cmd_download.sh b/dockerfiles/base/scripts/base/commands/cmd_download.sh index de39e9662d8..197a05f6430 100644 --- a/dockerfiles/base/scripts/base/commands/cmd_download.sh +++ b/dockerfiles/base/scripts/base/commands/cmd_download.sh @@ -33,9 +33,12 @@ post_cmd_download() { cmd_download() { FORCE_UPDATE=${1:-"--no-force"} + local IMAGES=${IMAGE_LIST} + IMAGES+=$'\n'${BOOTSTRAP_IMAGE_LIST} + IMAGES+=$'\n'${UTILITY_IMAGE_LIST} IFS=$'\n' - for SINGLE_IMAGE in $IMAGE_LIST; do + for SINGLE_IMAGE in $IMAGES; do VALUE_IMAGE=$(echo $SINGLE_IMAGE | cut -d'=' -f2) if [[ $FORCE_UPDATE == "--force" ]] || [[ $FORCE_UPDATE == "--pull" ]]; then diff --git a/dockerfiles/base/scripts/base/commands/cmd_offline.sh b/dockerfiles/base/scripts/base/commands/cmd_offline.sh index 666f48eadf6..19e5a070f18 100644 --- a/dockerfiles/base/scripts/base/commands/cmd_offline.sh +++ b/dockerfiles/base/scripts/base/commands/cmd_offline.sh @@ -38,8 +38,8 @@ post_cmd_offline() { cmd_offline() { # Read in optional stack images readarray -t STACK_IMAGE_LIST < /version/$CHE_VERSION/images-stacks - readarray -t BOOTSTRAP_IMAGE_LIST < ${SCRIPTS_BASE_CONTAINER_SOURCE_DIR}/images/images-bootstrap - readarray -t UTILITY_IMAGE_LIST < ${SCRIPTS_BASE_CONTAINER_SOURCE_DIR}/images/images-utilities + BOOTSTRAP_IMAGE_LIST=$(cat ${SCRIPTS_BASE_CONTAINER_SOURCE_DIR}/images/images-bootstrap) + UTILITY_IMAGE_LIST=$(cat ${SCRIPTS_BASE_CONTAINER_SOURCE_DIR}/images/images-utilities) # List all images to be saved if [[ $# -gt 0 ]] && [[ $1 = "--list" ]]; then