@@ -83,10 +83,10 @@ jobs:
8383 - name : Build console container image and save tarball
8484 env :
8585 TARGETARCH : ${{ matrix.targetarch }}
86- CONSOLE_PLUGIN_IMAGE : ${{ env.CONSOLE_NAME }}:${{ env.TAG }}
86+ CONSOLE_PLUGIN_IMAGE_BASE : ${{ env.CONSOLE_NAME }}:${{ env.TAG }}
8787 run : |
8888 make "console-build-${TARGETARCH}"
89- buildah push "${CONSOLE_PLUGIN_IMAGE }-${TARGETARCH}" "docker-archive:/tmp/console-image-${TARGETARCH}.tar:${CONSOLE_PLUGIN_IMAGE }-${TARGETARCH}"
89+ buildah push "${CONSOLE_PLUGIN_IMAGE_BASE }-${TARGETARCH}" "docker-archive:/tmp/console-image-${TARGETARCH}.tar:${CONSOLE_PLUGIN_IMAGE_BASE }-${TARGETARCH}"
9090
9191 - name : Upload image artifact
9292 uses : actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
@@ -182,7 +182,7 @@ jobs:
182182 env :
183183 UPLOADREGISTRY : ${{ matrix.upload_registry }}
184184 OPERATOR_IMG : ${{ env.NAME }}:${{ env.TAG }}
185- CONSOLE_PLUGIN_IMAGE : ${{ env.CONSOLE_NAME }}:${{ env.TAG }}
185+ CONSOLE_PLUGIN_IMAGE_BASE : ${{ env.CONSOLE_NAME }}:${{ env.TAG }}
186186 run : |
187187 make buildah-manifest
188188 buildah manifest add --arch=amd64 "${REGISTRY}/${OPERATOR_IMG}" "${REGISTRY}/${OPERATOR_IMG}-amd64"
@@ -191,10 +191,10 @@ jobs:
191191 DIGEST=$(skopeo inspect --format "{{.Digest}}" "docker://${UPLOADREGISTRY}/${OPERATOR_IMG}")
192192 echo "digest=$DIGEST" >> "$GITHUB_OUTPUT"
193193 make console-multiarch-manifest
194- buildah manifest add --arch=arm64 "${REGISTRY}/${CONSOLE_PLUGIN_IMAGE }" "${REGISTRY}/${CONSOLE_PLUGIN_IMAGE }-arm64"
195- buildah manifest add --arch=amd64 "${REGISTRY}/${CONSOLE_PLUGIN_IMAGE }" "${REGISTRY}/${CONSOLE_PLUGIN_IMAGE }-amd64"
194+ buildah manifest add --arch=arm64 "${REGISTRY}/${CONSOLE_PLUGIN_IMAGE_BASE }" "${REGISTRY}/${CONSOLE_PLUGIN_IMAGE_BASE }-arm64"
195+ buildah manifest add --arch=amd64 "${REGISTRY}/${CONSOLE_PLUGIN_IMAGE_BASE }" "${REGISTRY}/${CONSOLE_PLUGIN_IMAGE_BASE }-amd64"
196196 make console-push
197- CONSOLE_DIGEST=$(skopeo inspect --format "{{.Digest}}" "docker://${UPLOADREGISTRY}/${CONSOLE_PLUGIN_IMAGE }")
197+ CONSOLE_DIGEST=$(skopeo inspect --format "{{.Digest}}" "docker://${UPLOADREGISTRY}/${CONSOLE_PLUGIN_IMAGE_BASE }")
198198 echo "console_digest=$CONSOLE_DIGEST" >> "$GITHUB_OUTPUT"
199199
200200 - name : Install cosign
@@ -210,8 +210,8 @@ jobs:
210210 CONSOLE_DIGEST : ${{ steps.manifest-push.outputs.console_digest }}
211211 UPLOADREGISTRY : ${{ matrix.upload_registry }}
212212 OPERATOR_IMG : ${{ env.NAME }}:${{ env.TAG }}
213- CONSOLE_PLUGIN_IMAGE : ${{ env.CONSOLE_NAME }}:${{ env.TAG }}
213+ CONSOLE_PLUGIN_IMAGE_BASE : ${{ env.CONSOLE_NAME }}:${{ env.TAG }}
214214 run : |
215215 cat "${XDG_RUNTIME_DIR}/containers/auth.json" > ~/.docker/config.json
216216 cosign sign --yes "${UPLOADREGISTRY}/${OPERATOR_IMG}@${DIGEST}"
217- cosign sign --yes "${UPLOADREGISTRY}/${CONSOLE_PLUGIN_IMAGE }@${CONSOLE_DIGEST}"
217+ cosign sign --yes "${UPLOADREGISTRY}/${CONSOLE_PLUGIN_IMAGE_BASE }@${CONSOLE_DIGEST}"
0 commit comments