From 5a5412c5d12d535b41084a7e1971922af156ae7c Mon Sep 17 00:00:00 2001
From: Amir Zarrinkafsh <nightah@me.com>
Date: Wed, 20 May 2020 15:31:02 +1000
Subject: Fixing multi-arch container builds

---
 Dockerfile.arm32v7 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'Dockerfile.arm32v7')

diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 58a1834..12322d4 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -1,6 +1,12 @@
+FROM alpine as qemu
+
+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 qemu-arm-static /usr/bin
 
+COPY --from=qemu qemu-arm-static /usr/bin/
 COPY ./ /www/
 
 ENV USER darkhttpd
@@ -9,7 +15,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
 
-- 
cgit v1.2.3