diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-08-26 18:34:13 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-08-26 18:34:13 -0700 |
| commit | ffe64a26abb194a7ddcc5f410512043a65b3eb91 (patch) | |
| tree | f0b16a4eb9321bb042c66a9d44c3afa4cca22d99 /src/ci/docker/x86_64-gnu/Dockerfile | |
| parent | 398aaffc94367ed59420f5ac0b0238c04c9e4fa5 (diff) | |
| download | rust-ffe64a26abb194a7ddcc5f410512043a65b3eb91.tar.gz rust-ffe64a26abb194a7ddcc5f410512043a65b3eb91.zip | |
ci: Remove the need for `dumb-init`
Newer versions of Docker have a `--init` argument which spawns an init process in the container, which we should be able to use everywhere now.
Diffstat (limited to 'src/ci/docker/x86_64-gnu/Dockerfile')
| -rw-r--r-- | src/ci/docker/x86_64-gnu/Dockerfile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/ci/docker/x86_64-gnu/Dockerfile b/src/ci/docker/x86_64-gnu/Dockerfile index 3a6760b4762..7570bca5906 100644 --- a/src/ci/docker/x86_64-gnu/Dockerfile +++ b/src/ci/docker/x86_64-gnu/Dockerfile @@ -13,13 +13,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ xz-utils -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=x86_64-unknown-linux-gnu --enable-sanitizers --enable-profiler ENV SCRIPT python2.7 ../x.py test |