From a486eea055efa96e2dff55517abdaa89f8690ac1 Mon Sep 17 00:00:00 2001 From: Jordon Leach Date: Thu, 30 Nov 2023 10:46:24 -0500 Subject: [PATCH] Add docker runtime to package script --- scripts/bundle-catalog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/bundle-catalog b/scripts/bundle-catalog index ab82523..821bee3 100755 --- a/scripts/bundle-catalog +++ b/scripts/bundle-catalog @@ -14,6 +14,7 @@ DEST_IMAGE_NAME="ui-plugin-catalog" DEST_TAG="latest" DEST_REGISTRY="" DEST_NAMESPACE="rancher" +RUNTIME="docker" usage() { echo "Usage: $0 []" @@ -210,20 +211,20 @@ if [[ -n ${DEST_REGISTRY} ]]; then fi if [ ! -z "${IMAGE}" ]; then - REGISTRY=${DEST_REGISTRY} ORG=${DEST_NAMESPACE} REPO=${DEST_IMAGE_NAME} TAG=${DEST_TAG} ./scripts/package + REGISTRY=${DEST_REGISTRY} ORG=${DEST_NAMESPACE} REPO=${DEST_IMAGE_NAME} TAG=${DEST_TAG} RUNTIME=${RUNTIME} ./scripts/package echo -e "${CYAN}Pushing container image ...${RESET}" # Ensure that you do not overwrite production images if [[ "${DEST_NAMESPACE}" == "rancher" ]]; then - if docker manifest inspect ${IMAGE} 2>&1 1>/dev/null; then + if ${RUNTIME} manifest inspect ${IMAGE} 2>&1 1>/dev/null; then echo -e "${RED}${BOLD}Cannot overwrite production image ${DEST_IMAGE_NAME} since it already exists${RESET}" rm -rf ${TMP} exit 1 fi fi - docker push ${IMAGE} + ${RUNTIME} push ${IMAGE} fi popd > /dev/null