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

This commit is contained in:
Amir Zarrinkafsh 2020-05-20 15:32:19 +10:00 committed by GitHub
commit 94f44a4fe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions

View File

@ -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/

View File

@ -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/