diff options
| author |  Sascha Grunert <sgrunert@redhat.com>
| 2021-08-04 18:55:39 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-08-04 09:55:39 -0700 |
| commit | 1518f26dee716fdc6801cec48e8d5dfff2959ed3 (patch) | |
| tree | 8fea4d8097dff8ed3ebd1f82dc66c0de6a625427 | |
| parent | 4758070425ac2f4f43c71c82ba3aca847965e394 (diff) | |
| download | coredns-1518f26dee716fdc6801cec48e8d5dfff2959ed3.tar.gz coredns-1518f26dee716fdc6801cec48e8d5dfff2959ed3.tar.zst coredns-1518f26dee716fdc6801cec48e8d5dfff2959ed3.zip | |
Use docker buildx for release image (#4779)
This allows to choose the correct architecture in the image manifest,
which defaulted to the host system before applying this patch.
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
| -rw-r--r-- | Makefile.release | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/Makefile.release b/Makefile.release index d2078ee54..19581b044 100644 --- a/Makefile.release +++ b/Makefile.release @@ -67,6 +67,10 @@ DOCKER_IMAGE_NAME:=$(DOCKER)/$(NAME) PLATFORMS:=$(subst $(SPACE),$(COMMA),$(foreach arch,$(LINUX_ARCH),linux/$(arch))) DOCKER_IMAGE_LIST_VERSIONED:=$(shell echo $(LINUX_ARCH) | sed -e "s~[^ ]*~$(DOCKER_IMAGE_NAME)\-&:$(VERSION)~g") DOCKER_IMAGE_LIST_LATEST:=$(shell echo $(LINUX_ARCH) | sed -e "s~[^ ]*~$(DOCKER_IMAGE_NAME)\-&:latest~g") +QEMUVERSION=5.2.0-2 + +# Experimental CLI is required for docker buildx/manifest to work +export DOCKER_CLI_EXPERIMENTAL=enabled all: @echo Use the 'release' target to build a release, 'docker' for docker build. @@ -141,13 +145,25 @@ else @# 1. Copy appropriate coredns binary to build/docker/linux/<arch> @# 2. Copy Dockerfile to build/docker/linux/<arch> @rm -rf build/docker + + docker run --rm --privileged multiarch/qemu-user-static:$(QEMUVERSION) --reset -p yes + docker buildx version + BUILDER=$(shell docker buildx create --use) + for arch in $(LINUX_ARCH); do \ mkdir -p build/docker/linux/$${arch} ;\ tar -xzf release/$(NAME)_$(VERSION)_linux_$${arch}.tgz -C build/docker/linux/$${arch} ;\ cp Dockerfile build/docker/linux/$${arch} ;\ - docker build -t $(DOCKER_IMAGE_NAME)-$${arch}:$(VERSION) build/docker/linux/$${arch} ;\ + docker buildx build \ + --pull \ + --load \ + --platform linux/$$arch \ + -t $(DOCKER_IMAGE_NAME)-$${arch}:$(VERSION) \ + build/docker/linux/$${arch} ;\ docker tag $(DOCKER_IMAGE_NAME)-$${arch}:$(VERSION) $(DOCKER_IMAGE_NAME)-$${arch}:latest ;\ done + + docker buildx rm $$BUILDER endif .PHONY: docker-push @@ -155,11 +171,9 @@ docker-push: ifeq ($(DOCKER),) $(error "Please specify Docker registry to use. Use DOCKER=coredns for releases") else - @# Experimental CLI is required for docker manifest to work @# Pushes coredns/coredns-$arch:$version images @# Creates manifest for multi-arch image @# Pushes multi-arch image to coredns/coredns:$version - export DOCKER_CLI_EXPERIMENTAL=enabled @echo $(DOCKER_PASSWORD) | docker login -u $(DOCKER_LOGIN) --password-stdin @echo Pushing: $(VERSION) to $(DOCKER_IMAGE_NAME) for arch in $(LINUX_ARCH); do \ |