fix: add buildx context setup before starting build

Signed-off-by: bitliu <[email protected]>

Author: Xunzhuo

Makefile

@@ -130,8 +130,21 @@ image.buildx.verify:
 		docker buildx version; \
 	fi
 
+BUILDX_CONTEXT = gateway-api-builder
+BUILDX_PLATFORMS = linux/amd64,linux/arm64
+
+# Setup multi-arch enviroment
+# Recreate a buildx context for multi-arch images.
+.PHONY: image.multiarch.setup
+image.multiarch.setup: image.buildx.verify
+	@if [ "$(shell uname)" == "Linux" ]; then \
+		docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; \
+	fi
+	docker buildx rm $(BUILDX_CONTEXT) || :
+	docker buildx create --use --name $(BUILDX_CONTEXT) --platform "${BUILDX_PLATFORMS}"
+
 .PHONY: release-staging
-release-staging: image.buildx.verify
+release-staging: image.multiarch.setup
 	hack/build-and-push.sh
 
 # Generate a virtualenv install, which is useful for hacking on the

hack/build-and-push.sh

@@ -62,6 +62,11 @@ then
     BINARY_TAG="${BASE_REF}"
 fi
 
+# Support multi-arch image build and push.
+BUILDX_PLATFORMS="linux/amd64,linux/arm64"
+
+echo "Building and pushing admission-server image...${BUILDX_PLATFORMS}"
+
 # First, build the image, with the version info passed in.
 # Note that an image will *always* be built tagged with the GIT_TAG, so we know when it was built.
 # And, we add an extra version tag - either :latest or semver.
@@ -71,6 +76,6 @@ docker buildx build \
     -t ${REGISTRY}/admission-server:${VERSION_TAG} \
     --build-arg "COMMIT=${COMMIT}" \
     --build-arg "TAG=${BINARY_TAG}" \
-    --platform linux/amd64,linux/arm64 \
+    --platform ${BUILDX_PLATFORMS} \
     --push \
     .