Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ffe64a2

Browse files
committedAug 27, 2017
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.
1 parent 398aaff commit ffe64a2

File tree

45 files changed

+2
-230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2
-230
lines changed
 

‎src/ci/docker/arm-android/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ FROM ubuntu:16.04
33
COPY scripts/android-base-apt-get.sh /scripts/
44
RUN sh /scripts/android-base-apt-get.sh
55

6-
COPY scripts/dumb-init.sh /scripts/
7-
RUN sh /scripts/dumb-init.sh
8-
96
COPY scripts/android-ndk.sh /scripts/
107
RUN . /scripts/android-ndk.sh && \
118
download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm 9
@@ -38,4 +35,4 @@ COPY scripts/sccache.sh /scripts/
3835
RUN sh /scripts/sccache.sh
3936

4037
COPY scripts/android-start-emulator.sh /scripts/
41-
ENTRYPOINT ["/usr/bin/dumb-init", "--", "/scripts/android-start-emulator.sh"]
38+
ENTRYPOINT ["/scripts/android-start-emulator.sh"]

‎src/ci/docker/armhf-gnu/Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,9 @@ RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static
7373
# TODO: What is this?!
7474
RUN curl -O http://ftp.nl.debian.org/debian/dists/jessie/main/installer-armhf/current/images/device-tree/vexpress-v2p-ca15-tc1.dtb
7575

76-
COPY scripts/dumb-init.sh /scripts/
77-
RUN sh /scripts/dumb-init.sh
78-
7976
COPY scripts/sccache.sh /scripts/
8077
RUN sh /scripts/sccache.sh
8178

82-
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
83-
8479
ENV RUST_CONFIGURE_ARGS \
8580
--target=arm-unknown-linux-gnueabihf \
8681
--qemu-armhf-rootfs=/tmp/rootfs

0 commit comments

Comments
 (0)
Please sign in to comment.