diff options
| author | Venkata Giri Reddy <venkatagirireddy@gmail.com> | 2017-05-25 00:43:21 -0600 |
|---|---|---|
| committer | Venkata Giri Reddy <venkatagirireddy@gmail.com> | 2017-05-25 00:43:21 -0600 |
| commit | 5ce2eb1bd80beb955110f0cb81a3694311ee9592 (patch) | |
| tree | 2fb877c82535a65140070f6fd19b2038f4045389 | |
| parent | cf747fcbf716a8afced9d23aa15bb47d93805209 (diff) | |
| download | rust-5ce2eb1bd80beb955110f0cb81a3694311ee9592.tar.gz rust-5ce2eb1bd80beb955110f0cb81a3694311ee9592.zip | |
use shared scripts for init and sccache in cross image
| -rw-r--r-- | src/ci/docker/cross/Dockerfile | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/ci/docker/cross/Dockerfile b/src/ci/docker/cross/Dockerfile index 7759d91e1bb..1037067332b 100644 --- a/src/ci/docker/cross/Dockerfile +++ b/src/ci/docker/cross/Dockerfile @@ -21,14 +21,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ pkg-config -RUN curl -o /usr/local/bin/sccache \ - https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl && \ - chmod +x /usr/local/bin/sccache - -RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \ - dpkg -i dumb-init_*.deb && \ - rm dumb-init_*.deb -ENTRYPOINT ["/usr/bin/dumb-init", "--"] +# dumb-init +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh WORKDIR /tmp @@ -80,3 +75,10 @@ ENV RUST_CONFIGURE_ARGS \ --musl-root-armhf=/usr/local/arm-linux-musleabihf \ --musl-root-armv7=/usr/local/armv7-linux-musleabihf ENV SCRIPT python2.7 ../x.py dist --target $TARGETS + +# sccache +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +# init +ENTRYPOINT ["/usr/bin/dumb-init", "--"] |