Skip to content

Commit ac0463b

Browse files
tesujitesuji
committed
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.
1 parent 943b7b7 commit ac0463b

File tree

13 files changed

+26
-26
lines changed

13 files changed

+26
-26
lines changed

‎ci/docker/aarch64-unknown-linux-gnu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-aarch64-unknown-linux-gnu
22

3-
ENV CC_aarch64_unknown_linux_gnu=aarch64-unknown-linux-gnueabi-gcc
4-
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-unknown-linux-gnueabi-gcc
3+
ENV CC_aarch64_unknown_linux_gnu=aarch64-unknown-linux-gnueabi-gcc \
4+
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-unknown-linux-gnueabi-gcc

‎ci/docker/arm-unknown-linux-gnueabi/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-arm-unknown-linux-gnueabi
22

3-
ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc
4-
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-unknown-linux-gnueabi-gcc
3+
ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc \
4+
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-unknown-linux-gnueabi-gcc

‎ci/docker/arm-unknown-linux-gnueabihf/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-arm-unknown-linux-gnueabihf
22

3-
ENV CC_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-gcc
4-
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-unknown-linux-gnueabihf-gcc
3+
ENV CC_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-gcc \
4+
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-unknown-linux-gnueabihf-gcc

‎ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-armv7-unknown-linux-gnueabihf
22

3-
ENV CC_armv7_unknown_linux_gnueabihf=armv7-unknown-linux-gnueabihf-gcc
4-
ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=armv7-unknown-linux-gnueabihf-gcc
3+
ENV CC_armv7_unknown_linux_gnueabihf=armv7-unknown-linux-gnueabihf-gcc \
4+
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=armv7-unknown-linux-gnueabihf-gcc

‎ci/docker/mips-unknown-linux-gnu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-mips-unknown-linux-gnu
22

3-
ENV CC_mips_unknown_linux_gnu=mips-linux-gnu-gcc
4-
ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc
3+
ENV CC_mips_unknown_linux_gnu=mips-linux-gnu-gcc \
4+
CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc

‎ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-mips64-unknown-linux-gnuabi64
22

3-
ENV CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc
4-
ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc
3+
ENV CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \
4+
CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc

‎ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-mips64el-unknown-linux-gnuabi64
22

3-
ENV CC_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-gcc
4-
ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc
3+
ENV CC_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-gcc \
4+
CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc

‎ci/docker/mipsel-unknown-linux-gnu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-mipsel-unknown-linux-gnu
22

3-
ENV CC_mipsel_unknown_linux_gnu=mipsel-linux-gnu-gcc
4-
ENV CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_LINKER=mipsel-linux-gnu-gcc
3+
ENV CC_mipsel_unknown_linux_gnu=mipsel-linux-gnu-gcc \
4+
CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_LINKER=mipsel-linux-gnu-gcc

‎ci/docker/powerpc-unknown-linux-gnu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-powerpc-unknown-linux-gnu
22

3-
ENV CC_powerpc_unknown_linux_gnu=powerpc-unknown-linux-gnu-gcc
4-
ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-unknown-linux-gnu-gcc
3+
ENV CC_powerpc_unknown_linux_gnu=powerpc-unknown-linux-gnu-gcc \
4+
CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-unknown-linux-gnu-gcc

‎ci/docker/powerpc64-unknown-linux-gnu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-powerpc64-unknown-linux-gnu
22

3-
ENV CC_powerpc64_unknown_linux_gnu=powerpc64-unknown-linux-gnu-gcc
4-
ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-unknown-linux-gnu-gcc
3+
ENV CC_powerpc64_unknown_linux_gnu=powerpc64-unknown-linux-gnu-gcc \
4+
CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-unknown-linux-gnu-gcc

‎ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-powerpc64le-unknown-linux-gnu
22

3-
ENV CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc
4-
ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc
3+
ENV CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc \
4+
CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc

‎ci/docker/s390x-unknown-linux-gnu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-s390x-unknown-linux-gnu
22

3-
ENV CC_s390x_unknown_linux_gnu=s390x-ibm-linux-gnu-gcc
4-
ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-ibm-linux-gnu-gcc
3+
ENV CC_s390x_unknown_linux_gnu=s390x-ibm-linux-gnu-gcc \
4+
CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-ibm-linux-gnu-gcc

‎ci/docker/x86_64-unknown-freebsd/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM rust-x86_64-unknown-freebsd
22

3-
ENV CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-clang
4-
ENV CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd10-clang
3+
ENV CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-clang \
4+
CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd10-clang

0 commit comments

Comments
 (0)