From 6ac78cbe8958a780dfa5c1d4ba2f95b7f87a4bde Mon Sep 17 00:00:00 2001 From: Ian Fijolek Date: Tue, 21 Jan 2020 17:52:45 -0800 Subject: [PATCH] Stop copying extra qemu files --- Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bc40028..2dcb384 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,14 @@ ARG REPO=library + FROM multiarch/qemu-user-static:4.1.0-1 as qemu-user-static +# Make sure a dummy x86_64 file exists so that the copy command doesn't error +RUN touch /usr/bin/qemu-x86_64-fake + FROM ${REPO}/python:3-alpine -# TODO: Copy from docker hub image +# Copy mutliarch file to run builds on x86_64 ARG ARCH=x86_64 -COPY --from=qemu-user-static /usr/bin/qemu-* /usr/bin/ +COPY --from=qemu-user-static /usr/bin/qemu-${ARCH}-* /usr/bin/ RUN mkdir -p /src WORKDIR /src