better cache reuse

cross-rs · Jan 21, 2017 · 98dc884 · 98dc884
1 parent 60f7854
commit 98dc884
Show file tree

Hide file tree

Showing 24 changed files with 168 additions and 120 deletions.
diff --git a/docker/aarch64-unknown-linux-gnu/Dockerfile b/docker/aarch64-unknown-linux-gnu/Dockerfile
@@ -4,14 +4,10 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY openssl.sh qemu.sh /
 RUN apt-get install -y --no-install-recommends \
@@ -20,6 +16,12 @@ RUN apt-get install -y --no-install-recommends \
  bash /openssl.sh 1.0.2j linux-aarch64 aarch64-linux-gnu- && \
  bash /qemu.sh 2.8.0 aarch64
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
  CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
  CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \

diff --git a/docker/arm-unknown-linux-gnueabi/Dockerfile b/docker/arm-unknown-linux-gnueabi/Dockerfile
@@ -4,14 +4,10 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY openssl.sh qemu.sh /
 RUN apt-get install -y --no-install-recommends \
@@ -20,6 +16,12 @@ RUN apt-get install -y --no-install-recommends \
  bash /openssl.sh 1.0.2j linux-armv4 arm-linux-gnueabi- && \
  bash /qemu.sh 2.8.0 arm
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
  CC_arm_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \
  CXX_arm_unknown_linux_gnueabi=arm-linux-gnueabi-g++ \

diff --git a/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/docker/armv7-unknown-linux-gnueabihf/Dockerfile
@@ -4,14 +4,10 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY cmake.sh /
 RUN apt-get purge --auto-remove -y cmake && \
@@ -24,6 +20,12 @@ RUN apt-get install -y --no-install-recommends \
  bash /openssl.sh 1.0.2j linux-armv4 arm-linux-gnueabihf- && \
  bash /qemu.sh 2.8.0 arm
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
  CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
  CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ \

diff --git a/docker/i686-unknown-freebsd/Dockerfile b/docker/i686-unknown-freebsd/Dockerfile
@@ -4,19 +4,21 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY freebsd.sh openssl.sh /
 RUN bash /freebsd.sh i686 && \
  bash /openssl.sh 1.0.2j BSD-x86-elf i686-unknown-freebsd10-
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CARGO_TARGET_I686_UNKNOWN_FREEBSD_LINKER=i686-unknown-freebsd10-gcc \
  CC_i686_unknown_freebsd=i686-unknown-freebsd10-gcc \
  OPENSSL_DIR=/openssl \

diff --git a/docker/i686-unknown-linux-gnu/Dockerfile b/docker/i686-unknown-linux-gnu/Dockerfile
@@ -4,14 +4,10 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY cmake.sh /
 RUN apt-get purge --auto-remove -y cmake && \
@@ -22,6 +18,12 @@ RUN apt-get install -y --no-install-recommends \
  g++-multilib && \
  bash /openssl.sh 1.0.2j linux-elf "" -m32
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV OPENSSL_DIR=/openssl \
  OPENSSL_INCLUDE_DIR=/openssl/include \
  OPENSSL_LIB_DIR=/openssl/lib
diff --git a/docker/i686-unknown-linux-musl/Dockerfile b/docker/i686-unknown-linux-musl/Dockerfile
@@ -4,18 +4,20 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY musl.sh /
 RUN apt-get install -y --no-install-recommends \
  gcc-multilib && \
  bash /musl.sh 1.1.15 i386 -m32
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CC_i686_unknown_linux_musl=musl-gcc
diff --git a/docker/mips-unknown-linux-gnu/Dockerfile b/docker/mips-unknown-linux-gnu/Dockerfile
@@ -4,14 +4,10 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY override.sh /
 RUN bash /override.sh curl-sys 0.3.6
@@ -23,6 +19,12 @@ RUN apt-get install -y --no-install-recommends \
  bash /openssl.sh 1.0.2j linux-mips32 mips-linux-gnu- && \
  bash /qemu.sh 2.8.0 mips
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc \
  CC_mips_unknown_linux_gnu=mips-linux-gnu-gcc \
  CXX_mips_unknown_linux_gnu=mips-linux-gnu-g++ \

diff --git a/docker/mips64-unknown-linux-gnuabi64/Dockerfile b/docker/mips64-unknown-linux-gnuabi64/Dockerfile
@@ -4,14 +4,10 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY openssl.sh qemu.sh /
 RUN apt-get install -y --no-install-recommends \
@@ -20,6 +16,12 @@ RUN apt-get install -y --no-install-recommends \
  bash /openssl.sh 1.0.2j linux64-mips64 mips64-linux-gnuabi64- && \
  bash /qemu.sh 2.8.0 mips64
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
  CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \
  CXX_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-g++ \

diff --git a/docker/mips64el-unknown-linux-gnuabi64/Dockerfile b/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
@@ -4,14 +4,10 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY openssl.sh qemu.sh /
 RUN apt-get install -y --no-install-recommends \
@@ -20,6 +16,12 @@ RUN apt-get install -y --no-install-recommends \
  bash /openssl.sh 1.0.2j linux64-mips64 mips64el-linux-gnuabi64- && \
  bash /qemu.sh 2.8.0 mips64el
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc \
  CC_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-gcc \
  CXX_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-g++ \

diff --git a/docker/mipsel-unknown-linux-gnu/Dockerfile b/docker/mipsel-unknown-linux-gnu/Dockerfile
@@ -4,14 +4,10 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY openssl.sh qemu.sh /
 RUN apt-get install -y --no-install-recommends \
@@ -20,6 +16,12 @@ RUN apt-get install -y --no-install-recommends \
  bash /openssl.sh 1.0.2j linux-mips32 mipsel-linux-gnu- && \
  bash /qemu.sh 2.8.0 mipsel
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_LINKER=mipsel-linux-gnu-gcc \
  CC_mipsel_unknown_linux_gnu=mipsel-linux-gnu-gcc \
  CXX_mipsel_unknown_linux_gnu=mipsel-linux-gnu-g++ \

diff --git a/docker/powerpc-unknown-linux-gnu/Dockerfile b/docker/powerpc-unknown-linux-gnu/Dockerfile
@@ -4,14 +4,10 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY openssl.sh qemu.sh /
 RUN apt-get install -y --no-install-recommends \
@@ -20,6 +16,12 @@ RUN apt-get install -y --no-install-recommends \
  bash /openssl.sh 1.0.2j linux-ppc powerpc-linux-gnu- && \
  bash /qemu.sh 2.7.1 ppc
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
  CC_powerpc_unknown_linux_gnu=powerpc-linux-gnu-gcc \
  CXX_powerpc_unknown_linux_gnu=powerpc-linux-gnu-g++ \

diff --git a/docker/powerpc64-unknown-linux-gnu/Dockerfile b/docker/powerpc64-unknown-linux-gnu/Dockerfile
@@ -4,14 +4,10 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY override.sh /
 RUN bash /override.sh curl-sys 0.3.6
@@ -23,6 +19,12 @@ RUN apt-get install -y --no-install-recommends \
  bash /openssl.sh 1.0.2j linux-ppc64 powerpc64-linux-gnu- && \
  bash /qemu.sh 2.7.1 ppc64
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \
  CC_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-gcc \
  CXX_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-g++ \

diff --git a/docker/powerpc64le-unknown-linux-gnu/Dockerfile b/docker/powerpc64le-unknown-linux-gnu/Dockerfile
@@ -4,14 +4,10 @@ RUN apt-get update && \
  apt-get install -y --no-install-recommends \
  ca-certificates \
  cmake \
- curl \
  gcc \
  libc6-dev \
  make \
- pkg-config && \
- curl -LSfs http:https://japaric.github.io/trust/install.sh | \
- sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
- apt-get purge --auto-remove -y curl
+ pkg-config
 
 COPY openssl.sh qemu.sh /
 RUN apt-get install -y --no-install-recommends \
@@ -20,6 +16,12 @@ RUN apt-get install -y --no-install-recommends \
  bash /openssl.sh 1.0.2j linux-ppc64le powerpc64le-linux-gnu- && \
  bash /qemu.sh 2.7.1 ppc64le
 
+RUN apt-get install -y --no-install-recommends \
+ curl && \
+ curl -LSfs http:https://japaric.github.io/trust/install.sh | \
+ sh -s -- --git japaric/xargo --tag v0.3.5 --target x86_64-unknown-linux-gnu --to /usr/bin && \
+ apt-get purge --auto-remove -y curl
+
 ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
  CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc \
  CXX_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-g++ \