Skip to content

Commit 5ce2eb1

Browse files
committed
use shared scripts for init and sccache in cross image
1 parent cf747fc commit 5ce2eb1

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/ci/docker/cross/Dockerfile

+10-8
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2121
libssl-dev \
2222
pkg-config
2323

24-
RUN curl -o /usr/local/bin/sccache \
25-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl && \
26-
chmod +x /usr/local/bin/sccache
27-
28-
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
29-
dpkg -i dumb-init_*.deb && \
30-
rm dumb-init_*.deb
31-
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
24+
# dumb-init
25+
COPY scripts/dumb-init.sh /scripts/
26+
RUN sh /scripts/dumb-init.sh
3227

3328
WORKDIR /tmp
3429

@@ -80,3 +75,10 @@ ENV RUST_CONFIGURE_ARGS \
8075
--musl-root-armhf=/usr/local/arm-linux-musleabihf \
8176
--musl-root-armv7=/usr/local/armv7-linux-musleabihf
8277
ENV SCRIPT python2.7 ../x.py dist --target $TARGETS
78+
79+
# sccache
80+
COPY scripts/sccache.sh /scripts/
81+
RUN sh /scripts/sccache.sh
82+
83+
# init
84+
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

0 commit comments

Comments
 (0)