Docker's non-buildkit multi-arch support is pretty flaky
This commit is contained in:
parent
601455350d
commit
167c5a249f
|
@ -82,6 +82,7 @@ build-image: check-tools .build-image.$(ARCH)
|
||||||
.build-image.$(ARCH): $(KEYFILE)
|
.build-image.$(ARCH): $(KEYFILE)
|
||||||
docker build \
|
docker build \
|
||||||
$(DOCKER_BUILD_ARGS) \
|
$(DOCKER_BUILD_ARGS) \
|
||||||
|
--pull \
|
||||||
--platform=linux/$(DOCKER_ARCH) \
|
--platform=linux/$(DOCKER_ARCH) \
|
||||||
-t synit-build:$(ARCH) .
|
-t synit-build:$(ARCH) .
|
||||||
touch $@
|
touch $@
|
||||||
|
@ -89,6 +90,7 @@ build-image: check-tools .build-image.$(ARCH)
|
||||||
.build-image.rust.$(ARCH): .build-image.$(ARCH)
|
.build-image.rust.$(ARCH): .build-image.$(ARCH)
|
||||||
docker build \
|
docker build \
|
||||||
$(DOCKER_BUILD_ARGS) \
|
$(DOCKER_BUILD_ARGS) \
|
||||||
|
--pull \
|
||||||
--platform=linux/$(DOCKER_ARCH) \
|
--platform=linux/$(DOCKER_ARCH) \
|
||||||
-t synit-build-rust:$(ARCH) -f Dockerfile.rust .
|
-t synit-build-rust:$(ARCH) -f Dockerfile.rust .
|
||||||
touch $@
|
touch $@
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
case $1 in
|
case $1 in
|
||||||
aarch64) echo arm64;;
|
aarch64) echo arm64;;
|
||||||
x86_64) echo x86_64;;
|
x86_64) echo amd64;;
|
||||||
armv7) echo armhf;;
|
armv7) echo armhf;;
|
||||||
*)
|
*)
|
||||||
echo 'ERROR: Unknown Alpine ARCH '"$1" >&2
|
echo 'ERROR: Unknown Alpine ARCH '"$1" >&2
|
||||||
|
|
Loading…
Reference in New Issue