Skip to content

Commit 0945337

Browse files
committed
fixed multi arch
1 parent 8bc2851 commit 0945337

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,12 +256,10 @@ docker-push-core-manifest: ## Push the fat manifest docker image.
256256

257257
.PHONY: docker-push-manifest
258258
docker-push-manifest: ## Push the manifest image
259-
@# Extract the actual image digests from the architecture-specific manifest lists
260-
@amd64_digest=$$(docker buildx imagetools inspect ${CONTROLLER_IMAGE}-amd64:${TAG} --format "{{json .}}" | jq -r '.manifest.manifests[] | select(.platform.architecture=="amd64") | .digest'); \
261-
arm64_digest=$$(docker buildx imagetools inspect ${CONTROLLER_IMAGE}-arm64:${TAG} --format "{{json .}}" | jq -r '.manifest.manifests[] | select(.platform.architecture=="arm64") | .digest'); \
259+
@# Create multi-platform manifest from architecture-specific images
262260
docker buildx imagetools create -t ${CONTROLLER_IMAGE}:${TAG} \
263-
${CONTROLLER_IMAGE}-amd64@$$amd64_digest \
264-
${CONTROLLER_IMAGE}-arm64@$$arm64_digest
261+
${CONTROLLER_IMAGE}-amd64:${TAG} \
262+
${CONTROLLER_IMAGE}-arm64:${TAG}
265263

266264
##@ Tilt
267265
## --------------------------------------
@@ -399,4 +397,4 @@ release-templates: ## Generate release templates
399397

400398
.PHONY: upload-staging-artifacts
401399
upload-staging-artifacts: ## Upload release artifacts to the staging bucket
402-
gsutil cp $(RELEASE_DIR)/* gs://$(STAGING_BUCKET)/components/$(RELEASE_ALIAS_TAG)/
400+
gsutil cp $(RELEASE_DIR)/* gs://$(STAGING_BUCKET)/components/$(RELEASE_ALIAS_TAG)/

0 commit comments

Comments
 (0)