diff options
| author | Ty Coghlan <Coghlan.Ty@gmail.com> | 2017-07-09 11:01:27 -0400 |
|---|---|---|
| committer | Ty Coghlan <Coghlan.Ty@gmail.com> | 2017-07-12 21:25:36 -0400 |
| commit | 250346128b0083c8137171af503bda194c6124dd (patch) | |
| tree | 3de57658fcb4a3ff8e288aaf86f072d128d19f4d /src/ci/docker/i686-gnu-nopt | |
| parent | b695889fd62b96292d788b2543926e2c201fb709 (diff) | |
| download | rust-250346128b0083c8137171af503bda194c6124dd.tar.gz rust-250346128b0083c8137171af503bda194c6124dd.zip | |
Updated docker images to factor out common scripts
Diffstat (limited to 'src/ci/docker/i686-gnu-nopt')
| -rw-r--r-- | src/ci/docker/i686-gnu-nopt/Dockerfile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ci/docker/i686-gnu-nopt/Dockerfile b/src/ci/docker/i686-gnu-nopt/Dockerfile index 076be8f4291..56ff9922ae3 100644 --- a/src/ci/docker/i686-gnu-nopt/Dockerfile +++ b/src/ci/docker/i686-gnu-nopt/Dockerfile @@ -13,13 +13,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ xz-utils -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + ENTRYPOINT ["/usr/bin/dumb-init", "--"] ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests |