From 50f69ffe9209c0b9f03c2ec491ddb4d7726343d9 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Fri, 9 Aug 2019 02:51:46 -0700 Subject: [PATCH] Use docker buildx to build docker image (#864) xref: https://community.arm.com/developer/tools-software/tools/b/tools-software-ides-blog/posts/getting-started-with-docker-for-arm-on-linux Signed-off-by: Tamal Saha --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 61b1eb18f..38fa9af20 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ TAG := $(VERSION)_$(OS)_$(ARCH) TAG_PROD := $(TAG) TAG_DBG := $(VERSION)-dbg_$(OS)_$(ARCH) -GO_VERSION ?= 1.12.6 +GO_VERSION ?= 1.12.7 BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION)-stretch OUTBIN = bin/$(OS)_$(ARCH)/$(BIN) @@ -216,7 +216,7 @@ bin/.container-$(DOTFILE_IMAGE)-%: bin/$(OS)_$(ARCH)/$(BIN) $(DOCKERFILE_%) -e 's|{RESTIC_VER}|$(RESTIC_VER)|g' \ -e 's|{NEW_RESTIC_VER}|$(NEW_RESTIC_VER)|g' \ $(DOCKERFILE_$*) > bin/.dockerfile-$*-$(OS)_$(ARCH) - @docker build --pull -t $(IMAGE):$(TAG_$*) -f bin/.dockerfile-$*-$(OS)_$(ARCH) . + DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform $(OS)/$(ARCH) --load --pull -t $(IMAGE):$(TAG_$*) -f bin/.dockerfile-$*-$(OS)_$(ARCH) . @docker images -q $(IMAGE):$(TAG_$*) > $@ @echo