about summary refs log tree commit diff
path: root/src/ci/docker/i686-gnu-nopt
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-08-26 18:34:13 -0700
committerAlex Crichton <alex@alexcrichton.com>2017-08-26 18:34:13 -0700
commitffe64a26abb194a7ddcc5f410512043a65b3eb91 (patch)
treef0b16a4eb9321bb042c66a9d44c3afa4cca22d99 /src/ci/docker/i686-gnu-nopt
parent398aaffc94367ed59420f5ac0b0238c04c9e4fa5 (diff)
downloadrust-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/i686-gnu-nopt')
-rw-r--r--src/ci/docker/i686-gnu-nopt/Dockerfile5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/ci/docker/i686-gnu-nopt/Dockerfile b/src/ci/docker/i686-gnu-nopt/Dockerfile
index 56ff9922ae3..5a83bd318c4 100644
--- a/src/ci/docker/i686-gnu-nopt/Dockerfile
+++ b/src/ci/docker/i686-gnu-nopt/Dockerfile
@@ -14,13 +14,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   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=i686-unknown-linux-gnu --disable-optimize-tests
 ENV RUST_CHECK_TARGET check