Merge #326

326: Refactor Dockerfiles. r=therealprof a=reitermarkus Common packages are now installed with `common.sh`. Also fixes #330. Co-authored-by: Markus Reiter <me@reitermark.us>
cross-rs · Oct 18, 2019 · 4fb4fc1 · 4fb4fc1
2 parents d38d0cf + 3e11c60
commit 4fb4fc1
Show file tree

Hide file tree

Showing 62 changed files with 288 additions and 877 deletions.
diff --git a/docker/Dockerfile.aarch64-linux-android b/docker/Dockerfile.aarch64-linux-android
@@ -1,34 +1,20 @@
 FROM ubuntu:16.04
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    gcc \
-    libc6-dev \
-    make \
-    pkg-config \
-    git \
-    automake \
-    libtool \
-    m4 \
-    autoconf \
-    make \
-    file \
-    binutils
+COPY common.sh /
+RUN /common.sh
 
 COPY xargo.sh /
-RUN bash /xargo.sh
+RUN /xargo.sh
 
 COPY android-ndk.sh /
-RUN bash /android-ndk.sh arm64 21
+RUN /android-ndk.sh arm64 21
 ENV PATH=$PATH:/android-ndk/bin
 
 COPY android-system.sh /
-RUN bash /android-system.sh arm64
+RUN /android-system.sh arm64
 
 COPY qemu.sh /
-RUN bash /qemu.sh aarch64 android
+RUN /qemu.sh aarch64 android
 
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 

diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu
@@ -1,41 +1,27 @@
 FROM ubuntu:14.04
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    gcc \
-    libc6-dev \
-    make \
-    pkg-config \
-    git \
-    automake \
-    libtool \
-    m4 \
-    autoconf \
-    make \
-    file \
-    binutils
+COPY common.sh /
+RUN /common.sh
 
 COPY xargo.sh /
-RUN bash /xargo.sh
+RUN /xargo.sh
 
 COPY cmake.sh /
 RUN apt-get purge --auto-remove -y cmake && \
-    bash /cmake.sh
+    /cmake.sh
 
 RUN apt-get install -y --no-install-recommends \
     g++-aarch64-linux-gnu \
     libc6-dev-arm64-cross
 
 COPY qemu.sh /
-RUN bash /qemu.sh aarch64 linux softmmu
+RUN /qemu.sh aarch64 linux softmmu
 
 COPY dropbear.sh /
-RUN bash /dropbear.sh
+RUN /dropbear.sh
 
 COPY linux-image.sh /
-RUN bash /linux-image.sh aarch64
+RUN /linux-image.sh aarch64
 
 COPY linux-runner /
 

diff --git a/docker/Dockerfile.aarch64-unknown-linux-musl b/docker/Dockerfile.aarch64-unknown-linux-musl
@@ -1,30 +1,16 @@
 FROM ubuntu:18.04
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    gcc \
-    libc6-dev \
-    make \
-    pkg-config \
-    git \
-    automake \
-    libtool \
-    m4 \
-    autoconf \
-    make \
-    file \
-    binutils
+COPY common.sh /
+RUN /common.sh
 
 COPY xargo.sh /
-RUN bash /xargo.sh
+RUN /xargo.sh
 
 COPY qemu.sh /
-RUN bash /qemu.sh aarch64
+RUN /qemu.sh aarch64
 
 COPY musl.sh /
-RUN bash /musl.sh TARGET=aarch64-linux-musl
+RUN /musl.sh TARGET=aarch64-linux-musl
 
 # Allows qemu run dynamic linked binaries
 RUN ln -sf \

diff --git a/docker/Dockerfile.arm-linux-androideabi b/docker/Dockerfile.arm-linux-androideabi
@@ -1,34 +1,20 @@
 FROM ubuntu:16.04
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    gcc \
-    libc6-dev \
-    make \
-    pkg-config \
-    git \
-    automake \
-    libtool \
-    m4 \
-    autoconf \
-    make \
-    file \
-    binutils
+COPY common.sh /
+RUN /common.sh
 
 COPY xargo.sh /
-RUN bash /xargo.sh
+RUN /xargo.sh
 
 COPY android-ndk.sh /
-RUN bash /android-ndk.sh arm 21
+RUN /android-ndk.sh arm 21
 ENV PATH=$PATH:/android-ndk/bin
 
 COPY android-system.sh /
-RUN bash /android-system.sh arm
+RUN /android-system.sh arm
 
 COPY qemu.sh /
-RUN bash /qemu.sh arm android
+RUN /qemu.sh arm android
 
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 

diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabi b/docker/Dockerfile.arm-unknown-linux-gnueabi
@@ -1,34 +1,20 @@
 FROM ubuntu:14.04
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    gcc \
-    libc6-dev \
-    make \
-    pkg-config \
-    git \
-    automake \
-    libtool \
-    m4 \
-    autoconf \
-    make \
-    file \
-    binutils
+COPY common.sh /
+RUN /common.sh
 
 COPY xargo.sh /
-RUN bash /xargo.sh
+RUN /xargo.sh
 
 COPY cmake.sh /
 RUN apt-get purge --auto-remove -y cmake && \
-    bash /cmake.sh
+    /cmake.sh
 
 COPY qemu.sh /
 RUN apt-get install -y --no-install-recommends \
     g++-arm-linux-gnueabi \
     libc6-dev-armel-cross && \
-    bash /qemu.sh arm
+    /qemu.sh arm
 
 ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
     CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER=qemu-arm \

diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabihf b/docker/Dockerfile.arm-unknown-linux-gnueabihf
@@ -1,28 +1,14 @@
 FROM ubuntu:14.04
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    gcc \
-    libc6-dev \
-    make \
-    pkg-config \
-    git \
-    automake \
-    libtool \
-    m4 \
-    autoconf \
-    make \
-    file \
-    binutils
+COPY common.sh /
+RUN /common.sh
 
 COPY xargo.sh /
-RUN bash /xargo.sh
+RUN /xargo.sh
 
 COPY cmake.sh /
 RUN apt-get purge --auto-remove -y cmake && \
-    bash /cmake.sh
+    /cmake.sh
 
 RUN mkdir /usr/arm-linux-gnueabihf && \
     apt-get install -y --no-install-recommends curl xz-utils && \
@@ -35,7 +21,7 @@ ENV PATH /usr/arm-linux-gnueabihf/bin:$PATH
 
 COPY qemu.sh /
 
-RUN bash /qemu.sh arm
+RUN /qemu.sh arm
 
 RUN apt-get install -y --no-install-recommends \
     libc6-dev-armhf-cross

diff --git a/docker/Dockerfile.arm-unknown-linux-musleabi b/docker/Dockerfile.arm-unknown-linux-musleabi
@@ -1,30 +1,16 @@
 FROM ubuntu:18.04
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    gcc \
-    libc6-dev \
-    make \
-    pkg-config \
-    git \
-    automake \
-    libtool \
-    m4 \
-    autoconf \
-    make \
-    file \
-    binutils
+COPY common.sh /
+RUN /common.sh
 
 COPY xargo.sh /
-RUN bash /xargo.sh
+RUN /xargo.sh
 
 COPY qemu.sh /
-RUN bash /qemu.sh arm
+RUN /qemu.sh arm
 
 COPY musl.sh /
-RUN bash /musl.sh \
+RUN /musl.sh \
     TARGET=arm-linux-musleabi \
     "COMMON_CONFIG += --with-arch=armv6 \
                       --with-float=soft \

diff --git a/docker/Dockerfile.arm-unknown-linux-musleabihf b/docker/Dockerfile.arm-unknown-linux-musleabihf
@@ -1,30 +1,16 @@
 FROM ubuntu:18.04
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    gcc \
-    libc6-dev \
-    make \
-    pkg-config \
-    git \
-    automake \
-    libtool \
-    m4 \
-    autoconf \
-    make \
-    file \
-    binutils
+COPY common.sh /
+RUN /common.sh
 
 COPY xargo.sh /
-RUN bash /xargo.sh
+RUN /xargo.sh
 
 COPY qemu.sh /
-RUN bash /qemu.sh arm
+RUN /qemu.sh arm
 
 COPY musl.sh /
-RUN bash /musl.sh \
+RUN /musl.sh \
     TARGET=arm-linux-musleabihf \
     "COMMON_CONFIG += --with-arch=armv6 \
                       --with-fpu=vfp \

diff --git a/docker/Dockerfile.armv5te-unknown-linux-musleabi b/docker/Dockerfile.armv5te-unknown-linux-musleabi
@@ -1,30 +1,16 @@
 FROM ubuntu:18.04
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    gcc \
-    libc6-dev \
-    make \
-    pkg-config \
-    git \
-    automake \
-    libtool \
-    m4 \
-    autoconf \
-    make \
-    file \
-    binutils
+COPY common.sh /
+RUN /common.sh
 
 COPY xargo.sh /
-RUN bash /xargo.sh
+RUN /xargo.sh
 
 COPY qemu.sh /
-RUN bash /qemu.sh arm
+RUN /qemu.sh arm
 
 COPY musl.sh /
-RUN bash /musl.sh \
+RUN /musl.sh \
     TARGET=arm-linux-musleabi \
     "COMMON_CONFIG += --with-arch=armv5te \
                       --with-float=soft \

diff --git a/docker/Dockerfile.armv7-linux-androideabi b/docker/Dockerfile.armv7-linux-androideabi
@@ -1,34 +1,20 @@
 FROM ubuntu:16.04
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ca-certificates \
-    cmake \
-    gcc \
-    libc6-dev \
-    make \
-    pkg-config \
-    git \
-    automake \
-    libtool \
-    m4 \
-    autoconf \
-    make \
-    file \
-    binutils
+COPY common.sh /
+RUN /common.sh
 
 COPY xargo.sh /
-RUN bash /xargo.sh
+RUN /xargo.sh
 
 COPY android-ndk.sh /
-RUN bash /android-ndk.sh arm 21
+RUN /android-ndk.sh arm 21
 ENV PATH=$PATH:/android-ndk/bin
 
 COPY android-system.sh /
-RUN bash /android-system.sh arm
+RUN /android-system.sh arm
 
 COPY qemu.sh /
-RUN bash /qemu.sh arm android
+RUN /qemu.sh arm android
 
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/