Skip to content

Commit a31fa3a

Browse files
committed
build: specify buildx builder name everywhere
Fixes scenarios where there are other builders, too.
1 parent 21b624b commit a31fa3a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ IMAGE_ALL_PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v7
6969
ensure-buildx:
7070
./hack/init-buildx.sh
7171

72-
IMAGE_BUILDX_CMD ?= DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform=${IMAGE_ALL_PLATFORMS} --progress=auto --pull
72+
IMAGE_BUILDX_CMD ?= DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --builder=nfd-builder --platform=${IMAGE_ALL_PLATFORMS} --progress=auto --pull
7373

7474
IMAGE_BUILD_ARGS = --build-arg VERSION=$(VERSION) \
7575
--build-arg HOSTMOUNT_PREFIX=$(CONTAINER_HOSTMOUNT_PREFIX) \

hack/init-buildx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export DOCKER_CLI_EXPERIMENTAL=enabled
1919

2020
# We can skip setup if the current builder already has multi-arch
2121
# AND if it isn't the docker driver, which doesn't work
22-
current_builder="$(docker buildx inspect)"
22+
current_builder="$(docker buildx inspect nfd-builder || true)"
2323
# linux/amd64, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6
2424
if ! grep -q "^Driver: docker$" <<<"${current_builder}" && \
2525
grep -q "linux/amd64" <<<"${current_builder}" && \

0 commit comments

Comments
 (0)