From: Amir Zarrinkafsh <nightah@me.com>
Date: Wed, 20 May 2020 05:32:19 +0000 (+1000)
Subject: Merge branch 'master' into fix-docker-multiarch-builds
X-Git-Tag: 120405250~6^2
X-Git-Url: https://git.immae.eu/?p=github%2Fbastienwirtz%2Fhomer.git;a=commitdiff_plain;h=94f44a4fe822cb3c799fb34b880a9e462b5c9ed0

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

94f44a4fe822cb3c799fb34b880a9e462b5c9ed0
diff --cc Dockerfile.arm32v7
index 12322d4,e78d37c..d78d608
--- a/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
diff --cc Dockerfile.arm64v8
index 490a109,1e01245..b7c0484
--- a/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