diff --git a/src/ci/docker/cross/Dockerfile b/src/ci/docker/cross/Dockerfile index 7759d91e1bb63..b4399a8d53ff0 100644 --- a/src/ci/docker/cross/Dockerfile +++ b/src/ci/docker/cross/Dockerfile @@ -21,14 +21,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ pkg-config -RUN curl -o /usr/local/bin/sccache \ - https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl && \ - chmod +x /usr/local/bin/sccache - -RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \ - dpkg -i dumb-init_*.deb && \ - rm dumb-init_*.deb -ENTRYPOINT ["/usr/bin/dumb-init", "--"] +# dumb-init +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh WORKDIR /tmp @@ -38,23 +33,11 @@ RUN ./build-rumprun.sh COPY cross/build-arm-musl.sh /tmp/ RUN ./build-arm-musl.sh -# originally from -# https://downloads.openwrt.org/snapshots/trunk/ar71xx/generic/OpenWrt-Toolchain-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2 -RUN mkdir /usr/local/mips-linux-musl -RUN curl -L https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/OpenWrt-Toolchain-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2 | \ - tar xjf - -C /usr/local/mips-linux-musl --strip-components=2 -RUN for file in /usr/local/mips-linux-musl/bin/mips-openwrt-linux-*; do \ - ln -s $file /usr/local/bin/`basename $file`; \ - done +COPY cross/install-mips-musl.sh /tmp/ +RUN ./install-mips-musl.sh -# Note that this originally came from: -# https://downloads.openwrt.org/snapshots/trunk/malta/generic/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 -RUN mkdir /usr/local/mipsel-linux-musl -RUN curl -L https://s3.amazonaws.com/rust-lang-ci/libc/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 | \ - tar xjf - -C /usr/local/mipsel-linux-musl --strip-components=2 -RUN for file in /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-*; do \ - ln -s $file /usr/local/bin/`basename $file`; \ - done +COPY cross/install-mipsel-musl.sh /tmp/ +RUN ./install-mipsel-musl.sh ENV TARGETS=asmjs-unknown-emscripten ENV TARGETS=$TARGETS,wasm32-unknown-emscripten @@ -80,3 +63,10 @@ ENV RUST_CONFIGURE_ARGS \ --musl-root-armhf=/usr/local/arm-linux-musleabihf \ --musl-root-armv7=/usr/local/armv7-linux-musleabihf ENV SCRIPT python2.7 ../x.py dist --target $TARGETS + +# sccache +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +# init +ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/src/ci/docker/cross/install-mips-musl.sh b/src/ci/docker/cross/install-mips-musl.sh new file mode 100755 index 0000000000000..416bb75155e74 --- /dev/null +++ b/src/ci/docker/cross/install-mips-musl.sh @@ -0,0 +1,24 @@ +# Copyright 2017 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. + +set -ex + +mkdir /usr/local/mips-linux-musl + +# originally from +# https://downloads.openwrt.org/snapshots/trunk/ar71xx/generic/ +# OpenWrt-Toolchain-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2 +URL="https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror" +FILE="OpenWrt-Toolchain-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2" +curl -L "$URL/$FILE" | tar xjf - -C /usr/local/mips-linux-musl --strip-components=2 + +for file in /usr/local/mips-linux-musl/bin/mips-openwrt-linux-*; do + ln -s $file /usr/local/bin/`basename $file` +done diff --git a/src/ci/docker/cross/install-mipsel-musl.sh b/src/ci/docker/cross/install-mipsel-musl.sh new file mode 100755 index 0000000000000..9744b242fb919 --- /dev/null +++ b/src/ci/docker/cross/install-mipsel-musl.sh @@ -0,0 +1,24 @@ +# Copyright 2017 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. + +set -ex + +mkdir /usr/local/mipsel-linux-musl + +# Note that this originally came from: +# https://downloads.openwrt.org/snapshots/trunk/malta/generic/ +# OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 +URL="https://s3.amazonaws.com/rust-lang-ci/libc" +FILE="OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2" +curl -L "$URL/$FILE" | tar xjf - -C /usr/local/mipsel-linux-musl --strip-components=2 + +for file in /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-*; do + ln -s $file /usr/local/bin/`basename $file` +done