diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 1133c82cb..1a3c71912 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -46,6 +46,6 @@ jobs: - name: Cosign login run: | echo "${{ secrets.GITHUB_TOKEN }}" | cosign login -u ${{ github.repository_owner }} --password-stdin ghcr.io - echo "${{ secrets.quay_password }}" | cosign login -u ${{ github.quay_username }} --password-stdin quay.io + echo "${{ secrets.quay_password }}" | cosign login -u ${{ secrets.quay_username }} --password-stdin quay.io - name: Build images and push run: ./scripts/push-docker-image.sh diff --git a/scripts/push-docker-image.sh b/scripts/push-docker-image.sh index c0e5ce786..9d2b590ed 100755 --- a/scripts/push-docker-image.sh +++ b/scripts/push-docker-image.sh @@ -47,10 +47,6 @@ else TAG="v$(cat "$(git rev-parse --show-toplevel)/VERSION")-${COMMIT_SHA}" fi -echo ">> Tag: ${TAG}" -echo ">> Main branch: ${MAIN_BRANCH}" -echo ">> Image suffix: ${IMAGE_SUFFIX}" - # Compose full image names for retagging and publishing to remote container registries OPERATORS="" RELOADERS="" @@ -61,6 +57,9 @@ for i in ${REGISTRIES}; do WEBHOOKS="$i/${IMAGE_WEBHOOK}${IMAGE_SUFFIX} ${WEBHOOKS}" done +echo "Tag: ${TAG}" +echo "Main branch: ${MAIN_BRANCH}" +echo "Image suffix: ${IMAGE_SUFFIX}" for img in ${OPERATORS} ${RELOADERS} ${WEBHOOKS}; do echo "Building multi-arch image: $img:$TAG" done @@ -89,8 +88,9 @@ for r in ${OPERATORS} ${RELOADERS} ${WEBHOOKS}; do MANIFEST="${r}:${TAG}" IMAGES=() for arch in $CPU_ARCHS; do - docker push "${r}:${TAG}-${arch}" - IMAGES[${#IMAGES[@]}]="${r}:${TAG}-${arch}" + echo "Pushing image ${MANIFEST}-${arch}" + docker push "${MANIFEST}-${arch}" + IMAGES[${#IMAGES[@]}]="${MANIFEST}-${arch}" done # Create the manifest to join all images under one virtual tag.