Skip to content

Commit 06ffdeb

Browse files
committedJul 13, 2017
Auto merge of #43129 - Ophirr33:master, r=alexcrichton
Updated docker images to share scripts Attempts to resolve #42201. I managed to pull out five scripts (android-base-apt-get, ubuntu16-apt-get, make3, rustbuild-setup, and crosstool-ng). Let me know if there's more I can do or if I should change some names. r? @malbarbo
2 parents cfd4c81 + 2503461 commit 06ffdeb

File tree

45 files changed

+366
-711
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

+366
-711
lines changed
 

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

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,15 @@
11
FROM ubuntu:16.04
22

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
5-
ca-certificates \
6-
cmake \
7-
curl \
8-
file \
9-
g++ \
10-
git \
11-
libssl-dev \
12-
make \
13-
pkg-config \
14-
python2.7 \
15-
sudo \
16-
unzip \
17-
xz-utils
18-
19-
# dumb-init
3+
COPY scripts/android-base-apt-get.sh /scripts/
4+
RUN sh /scripts/android-base-apt-get.sh
5+
206
COPY scripts/dumb-init.sh /scripts/
217
RUN sh /scripts/dumb-init.sh
228

23-
# ndk
249
COPY scripts/android-ndk.sh /scripts/
2510
RUN . /scripts/android-ndk.sh && \
2611
download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm 9
2712

28-
# sdk
2913
RUN dpkg --add-architecture i386 && \
3014
apt-get update && \
3115
apt-get install -y --no-install-recommends \
@@ -39,7 +23,6 @@ COPY scripts/android-sdk.sh /scripts/
3923
RUN . /scripts/android-sdk.sh && \
4024
download_and_create_avd tools_r25.2.5-linux.zip armeabi-v7a 18
4125

42-
# env
4326
ENV PATH=$PATH:/android/sdk/tools
4427
ENV PATH=$PATH:/android/sdk/platform-tools
4528

@@ -51,10 +34,8 @@ ENV RUST_CONFIGURE_ARGS \
5134

5235
ENV SCRIPT python2.7 ../x.py test --target $TARGETS
5336

54-
# sccache
5537
COPY scripts/sccache.sh /scripts/
5638
RUN sh /scripts/sccache.sh
5739

58-
# init
5940
COPY scripts/android-start-emulator.sh /scripts/
6041
ENTRYPOINT ["/usr/bin/dumb-init", "--", "/scripts/android-start-emulator.sh"]

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,12 @@ 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-
RUN curl -o /usr/local/bin/sccache \
77-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl && \
78-
chmod +x /usr/local/bin/sccache
76+
COPY scripts/dumb-init.sh /scripts/
77+
RUN sh /scripts/dumb-init.sh
78+
79+
COPY scripts/sccache.sh /scripts/
80+
RUN sh /scripts/sccache.sh
7981

80-
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
81-
dpkg -i dumb-init_*.deb && \
82-
rm dumb-init_*.deb
8382
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
8483

8584
ENV RUST_CONFIGURE_ARGS \

0 commit comments

Comments
 (0)
Please sign in to comment.