From: Amir Zarrinkafsh 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/?a=commitdiff_plain;h=94f44a4fe822cb3c799fb34b880a9e462b5c9ed0;hp=5a5412c5d12d535b41084a7e1971922af156ae7c;p=github%2Fbastienwirtz%2Fhomer.git Merge branch 'master' into fix-docker-multiarch-builds --- diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 12322d4..d78d608 100644 --- 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 490a109..b7c0484 100644 --- 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/