Skip to content

Commit 3879567

Browse files
committed
travis: Delay sccache downloads in docker
Let's have this layer be towards the end as we're emprically changing sccache more than we're changing the rest of the image, so this'll allow us to reuse as much of the cached image as possible.
1 parent d558037 commit 3879567

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

src/ci/docker/dist-arm-linux/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
libssl-dev \
2828
pkg-config
2929

30-
RUN curl -o /usr/local/bin/sccache \
31-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-unknown-linux-musl && \
32-
chmod +x /usr/local/bin/sccache
33-
3430
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
3531
dpkg -i dumb-init_*.deb && \
3632
rm dumb-init_*.deb
@@ -65,6 +61,10 @@ RUN ./build-toolchains.sh
6561

6662
USER root
6763

64+
RUN curl -o /usr/local/bin/sccache \
65+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-unknown-linux-musl && \
66+
chmod +x /usr/local/bin/sccache
67+
6868
ENV PATH=$PATH:/x-tools/arm-unknown-linux-gnueabi/bin
6969
ENV PATH=$PATH:/x-tools/arm-unknown-linux-gnueabihf/bin
7070

src/ci/docker/dist-armv7-aarch64-linux/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
libssl-dev \
2828
pkg-config
2929

30-
RUN curl -o /usr/local/bin/sccache \
31-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-unknown-linux-musl && \
32-
chmod +x /usr/local/bin/sccache
33-
3430
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
3531
dpkg -i dumb-init_*.deb && \
3632
rm dumb-init_*.deb
@@ -66,6 +62,10 @@ RUN ./build-toolchains.sh
6662

6763
USER root
6864

65+
RUN curl -o /usr/local/bin/sccache \
66+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-unknown-linux-musl && \
67+
chmod +x /usr/local/bin/sccache
68+
6969
ENV PATH=$PATH:/x-tools/aarch64-unknown-linux-gnueabi/bin
7070
ENV PATH=$PATH:/x-tools/armv7-unknown-linux-gnueabihf/bin
7171

src/ci/docker/dist-powerpc-linux/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
libssl-dev \
2828
pkg-config
2929

30-
RUN curl -o /usr/local/bin/sccache \
31-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-unknown-linux-musl && \
32-
chmod +x /usr/local/bin/sccache
33-
3430
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
3531
dpkg -i dumb-init_*.deb && \
3632
rm dumb-init_*.deb
@@ -66,6 +62,10 @@ RUN ./build-powerpc-toolchain.sh
6662

6763
USER root
6864

65+
RUN curl -o /usr/local/bin/sccache \
66+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-unknown-linux-musl && \
67+
chmod +x /usr/local/bin/sccache
68+
6969
ENV PATH=$PATH:/x-tools/powerpc-unknown-linux-gnu/bin
7070

7171
ENV \

src/ci/docker/dist-powerpc64-linux/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2525
wget \
2626
xz-utils \
2727
libssl-dev \
28-
pkg-config
29-
30-
RUN curl -o /usr/local/bin/sccache \
31-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-unknown-linux-musl && \
32-
chmod +x /usr/local/bin/sccache
28+
pkg-config
3329

3430
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
3531
dpkg -i dumb-init_*.deb && \
@@ -70,6 +66,10 @@ RUN apt-get install -y --no-install-recommends rpm2cpio cpio
7066
COPY build-powerpc64le-toolchain.sh /tmp/
7167
RUN ./build-powerpc64le-toolchain.sh
7268

69+
RUN curl -o /usr/local/bin/sccache \
70+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-unknown-linux-musl && \
71+
chmod +x /usr/local/bin/sccache
72+
7373
ENV PATH=$PATH:/x-tools/powerpc64-unknown-linux-gnu/bin
7474

7575
ENV \

src/ci/docker/dist-s390x-linux-netbsd/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
libssl-dev \
2828
pkg-config
2929

30-
RUN curl -o /usr/local/bin/sccache \
31-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-unknown-linux-musl && \
32-
chmod +x /usr/local/bin/sccache
33-
3430
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
3531
dpkg -i dumb-init_*.deb && \
3632
rm dumb-init_*.deb
@@ -69,6 +65,10 @@ RUN ./build-netbsd-toolchain.sh
6965

7066
USER root
7167

68+
RUN curl -o /usr/local/bin/sccache \
69+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-16-sccache-x86_64-unknown-linux-musl && \
70+
chmod +x /usr/local/bin/sccache
71+
7272
ENV PATH=$PATH:/x-tools/s390x-ibm-linux-gnu/bin:/x-tools/x86_64-unknown-netbsd/bin
7373

7474
ENV \

0 commit comments

Comments
 (0)