From 236cca2a5af851eccda8d50b20b4d02158ba9b5b Mon Sep 17 00:00:00 2001 From: Zhiying Lin <54013513+zhiying-lin@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:34:56 +0800 Subject: [PATCH] fix: fix the publish pipeline by using mcr image (#982) --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9da7510c0..1667dbf19 100644 --- a/Makefile +++ b/Makefile @@ -266,16 +266,18 @@ run-memberagent: manifests generate fmt vet ## Run a controllers from your host. OUTPUT_TYPE ?= type=registry BUILDX_BUILDER_NAME ?= img-builder QEMU_VERSION ?= 7.2.0-1 +BUILDKIT_VERSION ?= v0.18.1 .PHONY: push push: $(MAKE) OUTPUT_TYPE="type=registry" docker-build-hub-agent docker-build-member-agent docker-build-refresh-token +# By default, docker buildx create will pull image moby/buildkit:buildx-stable-1 and hit the too many requests error .PHONY: docker-buildx-builder docker-buildx-builder: @if ! docker buildx ls | grep $(BUILDX_BUILDER_NAME); then \ docker run --rm --privileged mcr.microsoft.com/mirror/docker/multiarch/qemu-user-static:$(QEMU_VERSION) --reset -p yes; \ - docker buildx create --name $(BUILDX_BUILDER_NAME) --use; \ + docker buildx create --driver-opt image=mcr.microsoft.com/oss/v2/moby/buildkit:$(BUILDKIT_VERSION) --name $(BUILDX_BUILDER_NAME) --use; \ docker buildx inspect $(BUILDX_BUILDER_NAME) --bootstrap; \ fi