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/arm-android | |
| 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/arm-android')
| -rw-r--r-- | src/ci/docker/arm-android/Dockerfile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ci/docker/arm-android/Dockerfile b/src/ci/docker/arm-android/Dockerfile index 6cdaf6acfef..49d07d28d3c 100644 --- a/src/ci/docker/arm-android/Dockerfile +++ b/src/ci/docker/arm-android/Dockerfile @@ -3,9 +3,6 @@ FROM ubuntu:16.04 COPY scripts/android-base-apt-get.sh /scripts/ RUN sh /scripts/android-base-apt-get.sh -COPY scripts/dumb-init.sh /scripts/ -RUN sh /scripts/dumb-init.sh - COPY scripts/android-ndk.sh /scripts/ RUN . /scripts/android-ndk.sh && \ download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm 9 @@ -38,4 +35,4 @@ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh COPY scripts/android-start-emulator.sh /scripts/ -ENTRYPOINT ["/usr/bin/dumb-init", "--", "/scripts/android-start-emulator.sh"] +ENTRYPOINT ["/scripts/android-start-emulator.sh"] |