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

diff --combined Dockerfile.arm32v7
index 12322d41019edc3010c4128385d85bc8049bab4e,e78d37c8f61f561821c6359ee48ccf7c29fad171..d78d608c1713140beb58cbbcdf0059da32b7572a
--- 1/Dockerfile.arm32v7
--- 2/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@@ -1,12 -1,12 +1,13 @@@
 -FROM alpine AS builder
 +FROM alpine as qemu
  
 -# 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
 +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/
  
  ENV USER darkhttpd
@@@ -15,8 -15,7 +16,8 @@@ ENV GID 91
  ENV UID 911
  
  RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
 -    apk add -U darkhttpd
 +    apk add -U darkhttpd && \
 +    rm /usr/bin/qemu-arm-static
  
  USER darkhttpd
  

diff --combined Dockerfile.arm64v8
index 490a109a152c8c20d5e8fa3bae2b1d3c9d2b41e7,1e01245fb4e86eb1b66af721fbc314382088b4ed..b7c0484f54c3e1316ae34c6287e4385d099ceb6d
--- 1/Dockerfile.arm64v8
--- 2/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@@ -1,12 -1,12 +1,13 @@@
 -FROM alpine AS builder
 +FROM alpine as qemu
  
 -# 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
 +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/
  
  ENV USER darkhttpd
@@@ -15,8 -15,7 +16,8 @@@ ENV GID 91
  ENV UID 911
  
  RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
 -    apk add -U darkhttpd
 +    apk add -U darkhttpd && \
 +    rm /usr/bin/qemu-aarch64-static
  
  USER darkhttpd