From: Bastien Wirtz <bastien.wirtz@gmail.com>
Date: Wed, 20 May 2020 05:39:14 +0000 (-0700)
Subject: Merge pull request #56 from nightah/fix-docker-multiarch-builds
X-Git-Tag: 120405250~6
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=cf2df79869b7376a6ffbce699755779ef7b9f137;hp=525120de61ec27c8d64207a703061c9400f77c07;p=github%2Fbastienwirtz%2Fhomer.git

Merge pull request #56 from nightah/fix-docker-multiarch-builds

Fix docker multiarch builds
---

diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index e78d37c..d78d608 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -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,7 +16,8 @@ ENV GID 911
 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 --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 1e01245..b7c0484 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -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,7 +16,8 @@ ENV GID 911
 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