Skip to content

Commit 4fc1e6d

Browse files
authored
Merge pull request #1147 from aramase/automated-cherry-pick-of-#1146-upstream-release-1.3
Automated cherry pick of #1146: chore: pin buildx to `v0.10.6`
2 parents e286d98 + cba4224 commit 4fc1e6d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ OSVERSION ?= 1809
7777
OUTPUT_TYPE ?= registry
7878
BUILDX_BUILDER_NAME ?= img-builder
7979
QEMU_VERSION ?= 5.2.0-2
80+
# pinning buildkit version to v0.10.6 as v0.11.0 is injecting sbom/prov to manifest
81+
# causing the manifest push to fail
82+
BUILDKIT_VERSION ?= v0.10.6
8083

8184
# Binaries
8285
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
@@ -319,7 +322,7 @@ container-windows: docker-buildx-builder
319322
docker-buildx-builder:
320323
@if ! docker buildx ls | grep $(BUILDX_BUILDER_NAME); then \
321324
docker run --rm --privileged multiarch/qemu-user-static:$(QEMU_VERSION) --reset -p yes; \
322-
docker buildx create --name $(BUILDX_BUILDER_NAME) --use; \
325+
docker buildx create --driver-opt image=moby/buildkit:$(BUILDKIT_VERSION) --name $(BUILDX_BUILDER_NAME) --use; \
323326
docker buildx inspect $(BUILDX_BUILDER_NAME) --bootstrap; \
324327
fi
325328

0 commit comments

Comments
 (0)