From 167c5a249fcb3ba0d29fc4c909dcc761a0fa1aee Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Wed, 18 Oct 2023 21:31:26 +0200 Subject: [PATCH] Docker's non-buildkit multi-arch support is pretty flaky --- packaging/Makefile | 2 ++ packaging/map_docker_arch.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packaging/Makefile b/packaging/Makefile index dfde86c..ed2932f 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -82,6 +82,7 @@ build-image: check-tools .build-image.$(ARCH) .build-image.$(ARCH): $(KEYFILE) docker build \ $(DOCKER_BUILD_ARGS) \ + --pull \ --platform=linux/$(DOCKER_ARCH) \ -t synit-build:$(ARCH) . touch $@ @@ -89,6 +90,7 @@ build-image: check-tools .build-image.$(ARCH) .build-image.rust.$(ARCH): .build-image.$(ARCH) docker build \ $(DOCKER_BUILD_ARGS) \ + --pull \ --platform=linux/$(DOCKER_ARCH) \ -t synit-build-rust:$(ARCH) -f Dockerfile.rust . touch $@ diff --git a/packaging/map_docker_arch.sh b/packaging/map_docker_arch.sh index 914750d..d1b07f5 100755 --- a/packaging/map_docker_arch.sh +++ b/packaging/map_docker_arch.sh @@ -1,7 +1,7 @@ #!/bin/sh case $1 in aarch64) echo arm64;; - x86_64) echo x86_64;; + x86_64) echo amd64;; armv7) echo armhf;; *) echo 'ERROR: Unknown Alpine ARCH '"$1" >&2