Skip to content

Commit ffe64a2

Browse files
alexcrichtonalexcrichton
committed
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

‎src/ci/docker/asmjs/Dockerfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
gdb \
1414
xz-utils
1515

16-
COPY scripts/dumb-init.sh /scripts/
17-
RUN sh /scripts/dumb-init.sh
18-
1916
COPY scripts/emscripten.sh /scripts/
2017
RUN bash /scripts/emscripten.sh
2118

@@ -35,5 +32,3 @@ ENV SCRIPT python2.7 ../x.py test --target $TARGETS
3532

3633
COPY scripts/sccache.sh /scripts/
3734
RUN sh /scripts/sccache.sh
38-
39-
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

‎src/ci/docker/cross/Dockerfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2121
libssl-dev \
2222
pkg-config
2323

24-
COPY scripts/dumb-init.sh /scripts/
25-
RUN sh /scripts/dumb-init.sh
26-
2724
WORKDIR /tmp
2825

2926
COPY cross/build-rumprun.sh /tmp/
@@ -71,5 +68,3 @@ ENV SCRIPT python2.7 ../x.py dist --target $TARGETS
7168
# sccache
7269
COPY scripts/sccache.sh /scripts/
7370
RUN sh /scripts/sccache.sh
74-
75-
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

‎src/ci/docker/disabled/aarch64-gnu/Dockerfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,9 @@ RUN chmod +x rootfs/etc/init.d/rcS
7070
COPY scripts/qemu-bare-bones-addentropy.c /tmp/addentropy.c
7171
RUN aarch64-linux-gnu-gcc addentropy.c -o rootfs/addentropy -static
7272

73-
COPY scripts/dumb-init.sh /scripts/
74-
RUN sh /scripts/dumb-init.sh
75-
7673
COPY scripts/sccache.sh /scripts/
7774
RUN sh /scripts/sccache.sh
7875

79-
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
80-
8176
ENV RUST_CONFIGURE_ARGS \
8277
--target=aarch64-unknown-linux-gnu \
8378
--qemu-aarch64-rootfs=/tmp/rootfs

‎src/ci/docker/disabled/dist-aarch64-android/Dockerfile‎

Lines changed: 0 additions & 5 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 arm64 21
@@ -28,5 +25,3 @@ ENV SCRIPT python2.7 ../x.py dist --target $HOSTS --host $HOSTS
2825

2926
COPY scripts/sccache.sh /scripts/
3027
RUN sh /scripts/sccache.sh
31-
32-
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

‎src/ci/docker/disabled/dist-armv7-android/Dockerfile‎

Lines changed: 0 additions & 5 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_ndk android-ndk-r13b-linux-x86_64.zip && \
@@ -46,5 +43,3 @@ ENV SCRIPT \
4643

4744
COPY scripts/sccache.sh /scripts/
4845
RUN sh /scripts/sccache.sh
49-
50-
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

‎src/ci/docker/disabled/dist-i686-android/Dockerfile‎

Lines changed: 0 additions & 5 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_ndk android-ndk-r13b-linux-x86_64.zip && \
@@ -46,5 +43,3 @@ ENV SCRIPT \
4643

4744
COPY scripts/sccache.sh /scripts/
4845
RUN sh /scripts/sccache.sh
49-
50-
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

‎src/ci/docker/disabled/dist-x86_64-android/Dockerfile‎

Lines changed: 0 additions & 5 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 x86_64 21
@@ -28,5 +25,3 @@ ENV SCRIPT python2.7 ../x.py dist --target $HOSTS --host $HOSTS
2825

2926
COPY scripts/sccache.sh /scripts/
3027
RUN sh /scripts/sccache.sh
31-
32-
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

‎src/ci/docker/disabled/dist-x86_64-redox/Dockerfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ FROM ubuntu:16.04
33
COPY scripts/cross-apt-packages.sh /scripts/
44
RUN sh /scripts/cross-apt-packages.sh
55

6-
COPY scripts/dumb-init.sh /scripts/
7-
RUN sh /scripts/dumb-init.sh
8-
9-
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
10-
116
COPY scripts/crosstool-ng.sh /scripts/
127
RUN sh /scripts/crosstool-ng.sh
138

0 commit comments

Comments
 (0)