From 525120de61ec27c8d64207a703061c9400f77c07 Mon Sep 17 00:00:00 2001 From: Bastien Wirtz Date: Tue, 19 May 2020 20:41:05 -0700 Subject: [PATCH] Fix multiarch docker build. --- Dockerfile.arm32v7 | 7 +++++++ Dockerfile.arm64v8 | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 79a7a61..e78d37c 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -1,4 +1,11 @@ +FROM alpine AS builder + +# 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 + FROM arm32v7/alpine:3.11 +COPY --from=builder qemu-aarch64-static /usr/bin COPY ./ /www/ diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index 707dd83..1e01245 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -1,4 +1,11 @@ +FROM alpine AS builder + +# 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 + FROM arm64v8/alpine:3.11 +COPY qemu-arm-static /usr/bin COPY ./ /www/ -- 2.41.0