From decb4c7a118b7910292f2dfac5a08486a33573c3 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Tue, 14 Jan 2020 10:12:43 -0500 Subject: [PATCH] Always build a local release image if mirroring Both MIRROR_IMAGES=true and *_LOCAL_IMAGE rely on this image being build so we should build it in both cases. We had only been building it if *_LOCAL_IMAGE was set. Fixes: #880 --- 04_setup_ironic.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/04_setup_ironic.sh b/04_setup_ironic.sh index b78edc23c..a961e17a1 100755 --- a/04_setup_ironic.sh +++ b/04_setup_ironic.sh @@ -23,11 +23,9 @@ export REGISTRY_AUTH_FILE=$(mktemp "pullsecret--XXXXXXXXXX") COMBINED_AUTH_FILE=$(mktemp "combined-pullsecret--XXXXXXXXXX") jq -s '.[0] * .[1]' ${REGISTRY_AUTH_FILE} ${REGISTRY_CREDS} | tee ${COMBINED_AUTH_FILE} -_local_images= DOCKERFILE=$(mktemp "release-update--XXXXXXXXXX") echo "FROM $OPENSHIFT_RELEASE_IMAGE" > $DOCKERFILE for IMAGE_VAR in $(env | grep "_LOCAL_IMAGE=" | grep -o "^[^=]*") ; do - _local_images=1 IMAGE=${!IMAGE_VAR} sudo -E podman pull --authfile $COMBINED_AUTH_FILE $OPENSHIFT_RELEASE_IMAGE @@ -79,9 +77,8 @@ if [ ! -z "${MIRROR_IMAGES}" ]; then fi rm -rf "${EXTRACT_DIR}" -fi -if [ "${_local_images}" == "1" ]; then + # Build a local release image, if no *_LOCAL_IMAGE env variables are set then this is just a copy of the release image sudo podman image build --authfile $COMBINED_AUTH_FILE -t $OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE -f $DOCKERFILE sudo podman push --tls-verify=false --authfile $COMBINED_AUTH_FILE $OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE $OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE fi