diff --git a/olm.sh b/olm.sh index 2ee24d68230..b1b1d824744 100755 --- a/olm.sh +++ b/olm.sh @@ -70,11 +70,15 @@ for catalog in "${redhatCatalogs[@]}"; do myenv=$EXAMPLE yq -i e ".metadata.annotations.alm-examples |= (\"\${myenv}\" | envsubst)" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml # Avoid message: "There are unpinned images digests!" by using Digest Sha256:xxxx rather than vx.x.x - containerImage="quay.io/minio/operator:v$RELEASE" + containerImage="quay.io/minio/operator:v${RELEASE}" echo "containerImage: ${containerImage}" digest=$(docker pull $containerImage | grep Digest | awk -F ' ' '{print $2}') - operatorImageDigest="quay.io/minio/operator:${RELEASE}" - echo "digest: ${operatorImageDigest} @ ${digest}" + operatorImageDigest="quay.io/minio/operator:v${RELEASE}" + if [ -n "${digest}" ]; then + echo "digest: ${operatorImageDigest} @ ${digest}" + else + echo "digest: ${operatorImageDigest}" + fi yq -i ".metadata.annotations.containerImage |= (\"${operatorImageDigest}\")" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml # Console Image in Digested form: sha256:xxxx diff --git a/release.sh b/release.sh index 0db81fb6d5c..eaeccbddc12 100755 --- a/release.sh +++ b/release.sh @@ -29,7 +29,7 @@ then fi for file in "${files[@]}"; do - sed -e "s/${LATEST_RELEASE}/${RELEASE}/g" "$file" > "$file.tmp" && mv "$file.tmp" "$file" - sed -e "s/RELEASE\.[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]-[0-9][0-9]-[0-9][0-9]Z/${MINIO_RELEASE}/g" "$file" > "$file.tmp" && mv "$file.tmp" "$file" - sed -e "s/${CONSOLE_FROM}/${CONSOLE_RELEASE}/g" "$file" > "$file.tmp" && mv "$file.tmp" "$file" + sed -i -e "s/${LATEST_RELEASE}/${RELEASE}/g" "$file" + sed -i -e "s/RELEASE\.[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]-[0-9][0-9]-[0-9][0-9]Z/${MINIO_RELEASE}/g" + sed -i -e "s/${CONSOLE_FROM}/${CONSOLE_RELEASE}/g" "$file" done