revert Dockerfile.armv7-unknown-linux-gnueabihf changes

cross-rs · Oct 24, 2020 · 3a9984f · 3a9984f
1 parent 9bae7d7
commit 3a9984f
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabihf b/docker/Dockerfile.armv7-unknown-linux-gnueabihf
@@ -1,31 +1,28 @@
-# This was built from ./Dockerfile.context
-FROM alsuren/cross-context:latest as context
-
 FROM ubuntu:16.04
 
-COPY --from=context common.sh /
+COPY common.sh /
 RUN /common.sh
 
-COPY --from=context cmake.sh /
+COPY cmake.sh /
 RUN /cmake.sh
 
-COPY --from=context xargo.sh /
+COPY xargo.sh /
 RUN /xargo.sh
 
 RUN apt-get install --assume-yes --no-install-recommends \
     g++-arm-linux-gnueabihf \
     libc6-dev-armhf-cross
 
-COPY --from=context qemu.sh /
+COPY qemu.sh /
 RUN /qemu.sh arm softmmu
 
-COPY --from=context dropbear.sh /
+COPY dropbear.sh /
 RUN /dropbear.sh
 
-COPY --from=context linux-image.sh /
+COPY linux-image.sh /
 RUN /linux-image.sh armv7
 
-COPY --from=context linux-runner /
+COPY linux-runner /
 
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
     CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="/linux-runner armv7" \