Merge branch 'master' into fix-docker-multiarch-builds

diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 12322d41019edc3010c4128385d85bc8049bab4e..d78d608c1713140beb58cbbcdf0059da32b7572a 100644 (file)
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -5,6 +5,7 @@ ARG QEMU_VERSION "v4.2.0-7"
 RUN wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-arm-static && chmod +x qemu-arm-static
 
 FROM arm32v7/alpine:3.11
+COPY --from=builder qemu-aarch64-static /usr/bin
 
 COPY --from=qemu qemu-arm-static /usr/bin/
 COPY ./ /www/

diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 490a109a152c8c20d5e8fa3bae2b1d3c9d2b41e7..b7c0484f54c3e1316ae34c6287e4385d099ceb6d 100644 (file)
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -5,6 +5,7 @@ ARG QEMU_VERSION "v4.2.0-7"
 RUN wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-aarch64-static && chmod +x qemu-aarch64-static
 
 FROM arm64v8/alpine:3.11
+COPY qemu-arm-static /usr/bin
 
 COPY --from=qemu qemu-aarch64-static /usr/bin/
 COPY ./ /www/