diff --git a/bundle/pom.xml b/bundle/pom.xml index 47bea0686..77a2af0cc 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -153,6 +153,9 @@ --bundle-image ${kas.bundle.image} + --bundle-image-digest-file + ${project.build.directory}/bundle/jib-image.digest + --index-registry ${kas.index.image-registry} diff --git a/bundle/src/main/sh/build-push-index.sh b/bundle/src/main/sh/build-push-index.sh index c1fc47468..51c35ed26 100755 --- a/bundle/src/main/sh/build-push-index.sh +++ b/bundle/src/main/sh/build-push-index.sh @@ -1,6 +1,7 @@ #!/bin/sh BUNDLE_IMAGE= +BUNDLE_IMAGE_DIGEST_FILE='' INDEX_REGISTRY= INDEX_GROUP= INDEX_IMAGE= @@ -14,6 +15,11 @@ while [[ ${#} -gt 0 ]]; do shift shift ;; + "--bundle-image-digest-file" ) + BUNDLE_IMAGE_DIGEST_FILE="${2:?${key} requires a valid bundle image digest file reference}" + shift + shift + ;; "--index-registry" ) INDEX_REGISTRY="${2:?${key} requires an index registry value}" shift @@ -46,6 +52,11 @@ while [[ ${#} -gt 0 ]]; do esac done +if [ -f "${BUNDLE_IMAGE_DIGEST_FILE}" ] ; then + BUNDLE_IMAGE_BASE=$(echo "${BUNDLE_IMAGE}" | cut -d ':' -f 1) + BUNDLE_IMAGE="${BUNDLE_IMAGE_BASE}@$(cat "${BUNDLE_IMAGE_DIGEST_FILE}")" +fi + opm index add --bundles "${BUNDLE_IMAGE}" --generate -d $(pwd)/index.Dockerfile # set docker env variable to force it build images for linux/amd64 platform