From 1d3994090385c7cbfcb4f92c19d6e071e6f0aa41 Mon Sep 17 00:00:00 2001
From: David Laban <alsuren@gmail.com>
Date: Sun, 2 Aug 2020 14:26:43 +0100
Subject: [PATCH] alsuren/cross-context docker image

---
 docker/Dockerfile.armv7-unknown-linux-gnueabihf | 17 ++++++++++-------
 docker/Dockerfile.context                       |  9 +++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 docker/Dockerfile.context

diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabihf b/docker/Dockerfile.armv7-unknown-linux-gnueabihf
index e641a552d..f0b89d53e 100644
--- a/docker/Dockerfile.armv7-unknown-linux-gnueabihf
+++ b/docker/Dockerfile.armv7-unknown-linux-gnueabihf
@@ -1,28 +1,31 @@
+# This was built from ./Dockerfile.context
+FROM alsuren/cross-context:latest as context
+
 FROM ubuntu:16.04
 
-COPY common.sh /
+COPY --from=context common.sh /
 RUN /common.sh
 
-COPY cmake.sh /
+COPY --from=context cmake.sh /
 RUN /cmake.sh
 
-COPY xargo.sh /
+COPY --from=context xargo.sh /
 RUN /xargo.sh
 
 RUN apt-get install --assume-yes --no-install-recommends \
     g++-arm-linux-gnueabihf \
     libc6-dev-armhf-cross
 
-COPY qemu.sh /
+COPY --from=context qemu.sh /
 RUN /qemu.sh arm softmmu
 
-COPY dropbear.sh /
+COPY --from=context dropbear.sh /
 RUN /dropbear.sh
 
-COPY linux-image.sh /
+COPY --from=context linux-image.sh /
 RUN /linux-image.sh armv7
 
-COPY linux-runner /
+COPY --from=context linux-runner /
 
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
     CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="/linux-runner armv7" \
diff --git a/docker/Dockerfile.context b/docker/Dockerfile.context
new file mode 100644
index 000000000..2eb09f981
--- /dev/null
+++ b/docker/Dockerfile.context
@@ -0,0 +1,9 @@
+FROM scratch
+
+COPY common.sh /
+COPY cmake.sh /
+COPY xargo.sh /
+COPY qemu.sh /
+COPY dropbear.sh /
+COPY linux-image.sh /
+COPY linux-runner /