Fix multiarch docker build.

diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 79a7a61fb8f51a264e8b0df872697369aac77cb3..e78d37c8f61f561821c6359ee48ccf7c29fad171 100644 (file)
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -1,4 +1,11 @@
+FROM alpine AS builder
+
+# Download QEMU, see https://github.com/docker/hub-feedback/issues/1261
+ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-aarch64.tar.gz
+RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1
+
 FROM arm32v7/alpine:3.11
+COPY --from=builder qemu-aarch64-static /usr/bin
 
 COPY ./ /www/
 

diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 707dd83b1c243397da1bdc241001ccb967f38fcb..1e01245fb4e86eb1b66af721fbc314382088b4ed 100644 (file)
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -1,4 +1,11 @@
+FROM alpine AS builder
+
+# Download QEMU, see https://github.com/docker/hub-feedback/issues/1261
+ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-aarch64.tar.gz
+RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1
+
 FROM arm64v8/alpine:3.11
+COPY qemu-arm-static /usr/bin
 
 COPY ./ /www/