From 926b56dc8209e344d304ca539f9db14e54b955fb Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Wed, 3 Jul 2019 16:50:10 +0700 Subject: [PATCH] build: Reduce time to build new docker images By combining multiple ENV keys, we could reduce intermediate layer that docker processes, hence the time it takes to build new docker images reduced. --- ci/docker/aarch64-unknown-linux-gnu/Dockerfile | 4 ++-- ci/docker/arm-unknown-linux-gnueabi/Dockerfile | 4 ++-- ci/docker/arm-unknown-linux-gnueabihf/Dockerfile | 4 ++-- ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile | 4 ++-- ci/docker/mips-unknown-linux-gnu/Dockerfile | 4 ++-- ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile | 4 ++-- ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile | 4 ++-- ci/docker/mipsel-unknown-linux-gnu/Dockerfile | 4 ++-- ci/docker/powerpc-unknown-linux-gnu/Dockerfile | 4 ++-- ci/docker/powerpc64-unknown-linux-gnu/Dockerfile | 4 ++-- ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile | 4 ++-- ci/docker/s390x-unknown-linux-gnu/Dockerfile | 4 ++-- ci/docker/x86_64-unknown-freebsd/Dockerfile | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ci/docker/aarch64-unknown-linux-gnu/Dockerfile b/ci/docker/aarch64-unknown-linux-gnu/Dockerfile index 5f87638cabe..87ee2fcf6b1 100644 --- a/ci/docker/aarch64-unknown-linux-gnu/Dockerfile +++ b/ci/docker/aarch64-unknown-linux-gnu/Dockerfile @@ -1,4 +1,4 @@ FROM rust-aarch64-unknown-linux-gnu -ENV CC_aarch64_unknown_linux_gnu=aarch64-unknown-linux-gnueabi-gcc -ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-unknown-linux-gnueabi-gcc +ENV CC_aarch64_unknown_linux_gnu=aarch64-unknown-linux-gnueabi-gcc \ + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-unknown-linux-gnueabi-gcc diff --git a/ci/docker/arm-unknown-linux-gnueabi/Dockerfile b/ci/docker/arm-unknown-linux-gnueabi/Dockerfile index ca5ab1f78a1..bfe97f9481a 100644 --- a/ci/docker/arm-unknown-linux-gnueabi/Dockerfile +++ b/ci/docker/arm-unknown-linux-gnueabi/Dockerfile @@ -1,4 +1,4 @@ FROM rust-arm-unknown-linux-gnueabi -ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc -ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-unknown-linux-gnueabi-gcc +ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc \ + CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-unknown-linux-gnueabi-gcc diff --git a/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile b/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile index f03bb79d36b..a185c0b836e 100644 --- a/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile +++ b/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile @@ -1,4 +1,4 @@ FROM rust-arm-unknown-linux-gnueabihf -ENV CC_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-gcc -ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-unknown-linux-gnueabihf-gcc +ENV CC_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-gcc \ + CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-unknown-linux-gnueabihf-gcc diff --git a/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile index 8efe61856f6..be14c039c00 100644 --- a/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile +++ b/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile @@ -1,4 +1,4 @@ FROM rust-armv7-unknown-linux-gnueabihf -ENV CC_armv7_unknown_linux_gnueabihf=armv7-unknown-linux-gnueabihf-gcc -ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=armv7-unknown-linux-gnueabihf-gcc +ENV CC_armv7_unknown_linux_gnueabihf=armv7-unknown-linux-gnueabihf-gcc \ + CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=armv7-unknown-linux-gnueabihf-gcc diff --git a/ci/docker/mips-unknown-linux-gnu/Dockerfile b/ci/docker/mips-unknown-linux-gnu/Dockerfile index d64552a1f96..fee887b1745 100644 --- a/ci/docker/mips-unknown-linux-gnu/Dockerfile +++ b/ci/docker/mips-unknown-linux-gnu/Dockerfile @@ -1,4 +1,4 @@ FROM rust-mips-unknown-linux-gnu -ENV CC_mips_unknown_linux_gnu=mips-linux-gnu-gcc -ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc +ENV CC_mips_unknown_linux_gnu=mips-linux-gnu-gcc \ + CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc diff --git a/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile b/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile index 60761223857..18aaafb4324 100644 --- a/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile +++ b/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile @@ -1,4 +1,4 @@ FROM rust-mips64-unknown-linux-gnuabi64 -ENV CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc -ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc +ENV CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \ + CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc diff --git a/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile b/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile index 0d0138220a6..8eaf5281e87 100644 --- a/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile +++ b/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile @@ -1,4 +1,4 @@ FROM rust-mips64el-unknown-linux-gnuabi64 -ENV CC_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-gcc -ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc +ENV CC_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-gcc \ + CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc diff --git a/ci/docker/mipsel-unknown-linux-gnu/Dockerfile b/ci/docker/mipsel-unknown-linux-gnu/Dockerfile index 25857c4d846..48eb00bbc57 100644 --- a/ci/docker/mipsel-unknown-linux-gnu/Dockerfile +++ b/ci/docker/mipsel-unknown-linux-gnu/Dockerfile @@ -1,4 +1,4 @@ FROM rust-mipsel-unknown-linux-gnu -ENV CC_mipsel_unknown_linux_gnu=mipsel-linux-gnu-gcc -ENV CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_LINKER=mipsel-linux-gnu-gcc +ENV CC_mipsel_unknown_linux_gnu=mipsel-linux-gnu-gcc \ + CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_LINKER=mipsel-linux-gnu-gcc diff --git a/ci/docker/powerpc-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc-unknown-linux-gnu/Dockerfile index c96f43e36a9..8c8df97ecb6 100644 --- a/ci/docker/powerpc-unknown-linux-gnu/Dockerfile +++ b/ci/docker/powerpc-unknown-linux-gnu/Dockerfile @@ -1,4 +1,4 @@ FROM rust-powerpc-unknown-linux-gnu -ENV CC_powerpc_unknown_linux_gnu=powerpc-unknown-linux-gnu-gcc -ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-unknown-linux-gnu-gcc +ENV CC_powerpc_unknown_linux_gnu=powerpc-unknown-linux-gnu-gcc \ + CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-unknown-linux-gnu-gcc diff --git a/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile index 9ba83377ea0..5327b1bba00 100644 --- a/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile +++ b/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile @@ -1,4 +1,4 @@ FROM rust-powerpc64-unknown-linux-gnu -ENV CC_powerpc64_unknown_linux_gnu=powerpc64-unknown-linux-gnu-gcc -ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-unknown-linux-gnu-gcc +ENV CC_powerpc64_unknown_linux_gnu=powerpc64-unknown-linux-gnu-gcc \ + CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-unknown-linux-gnu-gcc diff --git a/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile index 0cc04327000..167b78e5930 100644 --- a/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile +++ b/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile @@ -1,4 +1,4 @@ FROM rust-powerpc64le-unknown-linux-gnu -ENV CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc -ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc +ENV CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc \ + CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc diff --git a/ci/docker/s390x-unknown-linux-gnu/Dockerfile b/ci/docker/s390x-unknown-linux-gnu/Dockerfile index 653cb5c763f..4b438acb7d1 100644 --- a/ci/docker/s390x-unknown-linux-gnu/Dockerfile +++ b/ci/docker/s390x-unknown-linux-gnu/Dockerfile @@ -1,4 +1,4 @@ FROM rust-s390x-unknown-linux-gnu -ENV CC_s390x_unknown_linux_gnu=s390x-ibm-linux-gnu-gcc -ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-ibm-linux-gnu-gcc +ENV CC_s390x_unknown_linux_gnu=s390x-ibm-linux-gnu-gcc \ + CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-ibm-linux-gnu-gcc diff --git a/ci/docker/x86_64-unknown-freebsd/Dockerfile b/ci/docker/x86_64-unknown-freebsd/Dockerfile index 46fa32c434f..9bb6af918dd 100644 --- a/ci/docker/x86_64-unknown-freebsd/Dockerfile +++ b/ci/docker/x86_64-unknown-freebsd/Dockerfile @@ -1,4 +1,4 @@ FROM rust-x86_64-unknown-freebsd -ENV CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-clang -ENV CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd10-clang +ENV CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-clang \ + CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd10-clang