Skip to content

Commit

Permalink
build: Reduce time to build new docker images
Browse files Browse the repository at this point in the history 
By combining multiple ENV keys, we could reduce intermediate
layer that docker processes, hence the time it takes to build
new docker images reduced.
  • Loading branch information
@tesuji
tesuji committed Aug 17, 2019
1 parent af49fef commit abd79e6
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions ci/docker/aarch64-unknown-linux-gnu/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/arm-unknown-linux-gnueabi/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/mips-unknown-linux-gnu/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/mipsel-unknown-linux-gnu/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/powerpc-unknown-linux-gnu/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/s390x-unknown-linux-gnu/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ci/docker/x86_64-unknown-freebsd/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit abd79e6

Please sign in to comment.