From 250346128b0083c8137171af503bda194c6124dd Mon Sep 17 00:00:00 2001 From: Ty Coghlan Date: Sun, 9 Jul 2017 11:01:27 -0400 Subject: [PATCH] Updated docker images to factor out common scripts --- src/ci/docker/arm-android/Dockerfile | 25 +------- src/ci/docker/armhf-gnu/Dockerfile | 11 ++-- src/ci/docker/asmjs/Dockerfile | 5 -- src/ci/docker/cross/Dockerfile | 2 - .../disabled/dist-aarch64-android/Dockerfile | 24 +------ .../disabled/dist-armv7-android/Dockerfile | 22 +------ .../disabled/dist-i686-android/Dockerfile | 22 +------ .../disabled/dist-x86_64-android/Dockerfile | 24 +------ src/ci/docker/disabled/wasm32/Dockerfile | 5 -- src/ci/docker/dist-aarch64-linux/Dockerfile | 64 ++++--------------- src/ci/docker/dist-android/Dockerfile | 22 +------ src/ci/docker/dist-arm-linux/Dockerfile | 64 ++++--------------- src/ci/docker/dist-armhf-linux/Dockerfile | 64 ++++--------------- src/ci/docker/dist-armv7-linux/Dockerfile | 64 ++++--------------- src/ci/docker/dist-fuchsia/Dockerfile | 11 ++-- .../docker/dist-i586-gnu-i686-musl/Dockerfile | 11 ++-- src/ci/docker/dist-i686-freebsd/Dockerfile | 11 ++-- src/ci/docker/dist-i686-linux/Dockerfile | 5 +- src/ci/docker/dist-mips-linux/Dockerfile | 12 ++-- src/ci/docker/dist-mips64-linux/Dockerfile | 11 ++-- src/ci/docker/dist-mips64el-linux/Dockerfile | 12 ++-- src/ci/docker/dist-mipsel-linux/Dockerfile | 11 ++-- src/ci/docker/dist-powerpc-linux/Dockerfile | 64 ++++--------------- src/ci/docker/dist-powerpc64-linux/Dockerfile | 64 ++++--------------- .../docker/dist-powerpc64le-linux/Dockerfile | 64 ++++--------------- src/ci/docker/dist-s390x-linux/Dockerfile | 64 ++++--------------- src/ci/docker/dist-x86_64-freebsd/Dockerfile | 11 ++-- src/ci/docker/dist-x86_64-linux/Dockerfile | 5 +- src/ci/docker/dist-x86_64-musl/Dockerfile | 11 ++-- src/ci/docker/dist-x86_64-netbsd/Dockerfile | 64 ++++--------------- src/ci/docker/i686-gnu-nopt/Dockerfile | 12 ++-- src/ci/docker/i686-gnu/Dockerfile | 12 ++-- src/ci/docker/scripts/android-base-apt-get.sh | 27 ++++++++ src/ci/docker/scripts/cross-apt-packages.sh | 36 +++++++++++ src/ci/docker/scripts/crosstool-ng.sh | 20 ++++++ src/ci/docker/scripts/make3.sh | 19 ++++++ src/ci/docker/scripts/rustbuild-setup.sh | 14 ++++ src/ci/docker/x86_64-gnu-aux/Dockerfile | 11 ++-- src/ci/docker/x86_64-gnu-debug/Dockerfile | 11 ++-- src/ci/docker/x86_64-gnu-distcheck/Dockerfile | 11 ++-- .../x86_64-gnu-full-bootstrap/Dockerfile | 11 ++-- .../docker/x86_64-gnu-incremental/Dockerfile | 11 ++-- src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile | 11 ++-- src/ci/docker/x86_64-gnu-nopt/Dockerfile | 11 ++-- src/ci/docker/x86_64-gnu/Dockerfile | 11 ++-- 45 files changed, 366 insertions(+), 711 deletions(-) create mode 100644 src/ci/docker/scripts/android-base-apt-get.sh create mode 100644 src/ci/docker/scripts/cross-apt-packages.sh create mode 100644 src/ci/docker/scripts/crosstool-ng.sh create mode 100644 src/ci/docker/scripts/make3.sh create mode 100644 src/ci/docker/scripts/rustbuild-setup.sh diff --git a/src/ci/docker/arm-android/Dockerfile b/src/ci/docker/arm-android/Dockerfile index 2a928c5ec7e89..6cdaf6acfef64 100644 --- a/src/ci/docker/arm-android/Dockerfile +++ b/src/ci/docker/arm-android/Dockerfile @@ -1,31 +1,15 @@ FROM ubuntu:16.04 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - cmake \ - curl \ - file \ - g++ \ - git \ - libssl-dev \ - make \ - pkg-config \ - python2.7 \ - sudo \ - unzip \ - xz-utils - -# dumb-init +COPY scripts/android-base-apt-get.sh /scripts/ +RUN sh /scripts/android-base-apt-get.sh + COPY scripts/dumb-init.sh /scripts/ RUN sh /scripts/dumb-init.sh -# ndk COPY scripts/android-ndk.sh /scripts/ RUN . /scripts/android-ndk.sh && \ download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm 9 -# sdk RUN dpkg --add-architecture i386 && \ apt-get update && \ apt-get install -y --no-install-recommends \ @@ -39,7 +23,6 @@ COPY scripts/android-sdk.sh /scripts/ RUN . /scripts/android-sdk.sh && \ download_and_create_avd tools_r25.2.5-linux.zip armeabi-v7a 18 -# env ENV PATH=$PATH:/android/sdk/tools ENV PATH=$PATH:/android/sdk/platform-tools @@ -51,10 +34,8 @@ ENV RUST_CONFIGURE_ARGS \ ENV SCRIPT python2.7 ../x.py test --target $TARGETS -# sccache COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -# init COPY scripts/android-start-emulator.sh /scripts/ ENTRYPOINT ["/usr/bin/dumb-init", "--", "/scripts/android-start-emulator.sh"] diff --git a/src/ci/docker/armhf-gnu/Dockerfile b/src/ci/docker/armhf-gnu/Dockerfile index 03e0b78ba89b3..d289a93c35295 100644 --- a/src/ci/docker/armhf-gnu/Dockerfile +++ b/src/ci/docker/armhf-gnu/Dockerfile @@ -73,13 +73,12 @@ RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static # TODO: What is this?! RUN curl -O http://ftp.nl.debian.org/debian/dists/jessie/main/installer-armhf/current/images/device-tree/vexpress-v2p-ca15-tc1.dtb -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh -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", "--"] ENV RUST_CONFIGURE_ARGS \ diff --git a/src/ci/docker/asmjs/Dockerfile b/src/ci/docker/asmjs/Dockerfile index 899ce1e4569df..1c39e8523daaa 100644 --- a/src/ci/docker/asmjs/Dockerfile +++ b/src/ci/docker/asmjs/Dockerfile @@ -13,15 +13,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ xz-utils -# dumb-init COPY scripts/dumb-init.sh /scripts/ RUN sh /scripts/dumb-init.sh -# emscripten COPY scripts/emscripten.sh /scripts/ RUN bash /scripts/emscripten.sh -# env ENV PATH=$PATH:/emsdk-portable ENV PATH=$PATH:/emsdk-portable/clang/e1.37.13_64bit/ ENV PATH=$PATH:/emsdk-portable/emscripten/1.37.13/ @@ -36,9 +33,7 @@ ENV RUST_CONFIGURE_ARGS --target=$TARGETS ENV SCRIPT python2.7 ../x.py test --target $TARGETS -# cache COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -# init ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/src/ci/docker/cross/Dockerfile b/src/ci/docker/cross/Dockerfile index b4399a8d53ff0..70dfbb53da24e 100644 --- a/src/ci/docker/cross/Dockerfile +++ b/src/ci/docker/cross/Dockerfile @@ -21,7 +21,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ pkg-config -# dumb-init COPY scripts/dumb-init.sh /scripts/ RUN sh /scripts/dumb-init.sh @@ -68,5 +67,4 @@ ENV SCRIPT python2.7 ../x.py dist --target $TARGETS COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -# init ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/src/ci/docker/disabled/dist-aarch64-android/Dockerfile b/src/ci/docker/disabled/dist-aarch64-android/Dockerfile index 918d2911ae28f..1c9e036f093da 100644 --- a/src/ci/docker/disabled/dist-aarch64-android/Dockerfile +++ b/src/ci/docker/disabled/dist-aarch64-android/Dockerfile @@ -1,31 +1,15 @@ FROM ubuntu:16.04 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - cmake \ - curl \ - file \ - g++ \ - git \ - libssl-dev \ - make \ - pkg-config \ - python2.7 \ - sudo \ - unzip \ - xz-utils - -# dumb-init +COPY scripts/android-base-apt-get.sh /scripts/ +RUN sh /scripts/android-base-apt-get.sh + COPY scripts/dumb-init.sh /scripts/ RUN sh /scripts/dumb-init.sh -# ndk COPY scripts/android-ndk.sh /scripts/ RUN . /scripts/android-ndk.sh && \ download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm64 21 -# env ENV PATH=$PATH:/android/ndk/arm64-21/bin ENV DEP_Z_ROOT=/android/ndk/arm64-21/sysroot/usr/ @@ -42,9 +26,7 @@ ENV RUST_CONFIGURE_ARGS \ ENV SCRIPT python2.7 ../x.py dist --target $HOSTS --host $HOSTS -# sccache COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -# init ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/src/ci/docker/disabled/dist-armv7-android/Dockerfile b/src/ci/docker/disabled/dist-armv7-android/Dockerfile index aed82e6c13872..326e00548b1ce 100644 --- a/src/ci/docker/disabled/dist-armv7-android/Dockerfile +++ b/src/ci/docker/disabled/dist-armv7-android/Dockerfile @@ -1,26 +1,11 @@ FROM ubuntu:16.04 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - cmake \ - curl \ - file \ - g++ \ - git \ - libssl-dev \ - make \ - pkg-config \ - python2.7 \ - sudo \ - unzip \ - xz-utils +COPY scripts/android-base-apt-get.sh /scripts/ +RUN sh /scripts/android-base-apt-get.sh -# dumb-init COPY scripts/dumb-init.sh /scripts/ RUN sh /scripts/dumb-init.sh -# ndk COPY scripts/android-ndk.sh /scripts/ RUN . /scripts/android-ndk.sh && \ download_ndk android-ndk-r13b-linux-x86_64.zip && \ @@ -31,7 +16,6 @@ RUN . /scripts/android-ndk.sh && \ RUN chmod 777 /android/ndk && \ ln -s /android/ndk/arm-21 /android/ndk/arm -# env ENV PATH=$PATH:/android/ndk/arm-9/bin ENV DEP_Z_ROOT=/android/ndk/arm-9/sysroot/usr/ @@ -60,9 +44,7 @@ ENV SCRIPT \ ln -s /android/ndk/arm-9 /android/ndk/arm && \ python2.7 ../x.py dist --host $HOSTS --target $HOSTS) -# sccache COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -# init ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/src/ci/docker/disabled/dist-i686-android/Dockerfile b/src/ci/docker/disabled/dist-i686-android/Dockerfile index f012e869e7885..d01648e2b9d7f 100644 --- a/src/ci/docker/disabled/dist-i686-android/Dockerfile +++ b/src/ci/docker/disabled/dist-i686-android/Dockerfile @@ -1,26 +1,11 @@ FROM ubuntu:16.04 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - cmake \ - curl \ - file \ - g++ \ - git \ - libssl-dev \ - make \ - pkg-config \ - python2.7 \ - sudo \ - unzip \ - xz-utils +COPY scripts/android-base-apt-get.sh /scripts/ +RUN sh /scripts/android-base-apt-get.sh -# dumb-init COPY scripts/dumb-init.sh /scripts/ RUN sh /scripts/dumb-init.sh -# ndk COPY scripts/android-ndk.sh /scripts/ RUN . /scripts/android-ndk.sh && \ download_ndk android-ndk-r13b-linux-x86_64.zip && \ @@ -31,7 +16,6 @@ RUN . /scripts/android-ndk.sh && \ RUN chmod 777 /android/ndk && \ ln -s /android/ndk/x86-21 /android/ndk/x86 -# env ENV PATH=$PATH:/android/ndk/x86-9/bin ENV DEP_Z_ROOT=/android/ndk/x86-9/sysroot/usr/ @@ -60,9 +44,7 @@ ENV SCRIPT \ ln -s /android/ndk/x86-9 /android/ndk/x86 && \ python2.7 ../x.py dist --host $HOSTS --target $HOSTS) -# sccache COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -# init ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/src/ci/docker/disabled/dist-x86_64-android/Dockerfile b/src/ci/docker/disabled/dist-x86_64-android/Dockerfile index 0c586452840f9..2622b4b3fac3b 100644 --- a/src/ci/docker/disabled/dist-x86_64-android/Dockerfile +++ b/src/ci/docker/disabled/dist-x86_64-android/Dockerfile @@ -1,31 +1,15 @@ FROM ubuntu:16.04 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - cmake \ - curl \ - file \ - g++ \ - git \ - libssl-dev \ - make \ - pkg-config \ - python2.7 \ - sudo \ - unzip \ - xz-utils - -# dumb-init +COPY scripts/android-base-apt-get.sh /scripts/ +RUN sh /scripts/android-base-apt-get.sh + COPY scripts/dumb-init.sh /scripts/ RUN sh /scripts/dumb-init.sh -# ndk COPY scripts/android-ndk.sh /scripts/ RUN . /scripts/android-ndk.sh && \ download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip x86_64 21 -# env ENV PATH=$PATH:/android/ndk/x86_64-21/bin ENV DEP_Z_ROOT=/android/ndk/x86_64-21/sysroot/usr/ @@ -42,9 +26,7 @@ ENV RUST_CONFIGURE_ARGS \ ENV SCRIPT python2.7 ../x.py dist --target $HOSTS --host $HOSTS -# sccache COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -# init ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/src/ci/docker/disabled/wasm32/Dockerfile b/src/ci/docker/disabled/wasm32/Dockerfile index c75b5d455c522..66d7c48022263 100644 --- a/src/ci/docker/disabled/wasm32/Dockerfile +++ b/src/ci/docker/disabled/wasm32/Dockerfile @@ -15,20 +15,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ jq \ bzip2 -# dumb-init COPY scripts/dumb-init.sh /scripts/ RUN sh /scripts/dumb-init.sh -# emscripten COPY scripts/emscripten-wasm.sh /scripts/ RUN bash /scripts/emscripten-wasm.sh COPY disabled/wasm32/node.sh /usr/local/bin/node -# cache COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -# env ENV PATH=$PATH:/emsdk-portable ENV PATH=$PATH:/emsdk-portable/clang/e1.37.13_64bit/ ENV PATH=$PATH:/emsdk-portable/emscripten/1.37.13/ @@ -42,5 +38,4 @@ ENV RUST_CONFIGURE_ARGS --target=$TARGETS --experimental-targets=WebAssembly ENV SCRIPT python2.7 ../x.py test --target $TARGETS -# init ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/src/ci/docker/dist-aarch64-linux/Dockerfile b/src/ci/docker/dist-aarch64-linux/Dockerfile index 0134a5407932a..cc3b6b8c692a6 100644 --- a/src/ci/docker/dist-aarch64-linux/Dockerfile +++ b/src/ci/docker/dist-aarch64-linux/Dockerfile @@ -1,58 +1,23 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - automake \ - bison \ - bzip2 \ - ca-certificates \ - cmake \ - curl \ - file \ - flex \ - g++ \ - gawk \ - gdb \ - git \ - gperf \ - help2man \ - libncurses-dev \ - libtool-bin \ - make \ - patch \ - python2.7 \ - sudo \ - texinfo \ - wget \ - xz-utils \ - libssl-dev \ - pkg-config +COPY scripts/cross-apt-packages.sh /scripts/ +RUN sh /scripts/cross-apt-packages.sh + +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh -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", "--"] -# Ubuntu 16.04 (this contianer) ships with make 4, but something in the +# Ubuntu 16.04 (this container) ships with make 4, but something in the # toolchains we build below chokes on that, so go back to make 3 -RUN curl https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf - && \ - cd make-3.81 && \ - ./configure --prefix=/usr && \ - make && \ - make install && \ - cd .. && \ - rm -rf make-3.81 +COPY scripts/make3.sh /scripts/ +RUN sh /scripts/make3.sh -RUN curl http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2 | \ - tar xjf - && \ - cd crosstool-ng && \ - ./configure --prefix=/usr/local && \ - make -j$(nproc) && \ - make install && \ - cd .. && \ - rm -rf crosstool-ng +COPY scripts/crosstool-ng.sh /scripts/ +RUN sh /scripts/crosstool-ng.sh -RUN groupadd -r rustbuild && useradd -m -r -g rustbuild rustbuild -RUN mkdir /x-tools && chown rustbuild:rustbuild /x-tools +COPY scripts/rustbuild-setup.sh /scripts/ +RUN sh /scripts/rustbuild-setup.sh USER rustbuild WORKDIR /tmp @@ -61,9 +26,8 @@ RUN ./build-toolchains.sh USER root -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV PATH=$PATH:/x-tools/aarch64-unknown-linux-gnueabi/bin diff --git a/src/ci/docker/dist-android/Dockerfile b/src/ci/docker/dist-android/Dockerfile index 31389dd148a8a..f3beddfae0a16 100644 --- a/src/ci/docker/dist-android/Dockerfile +++ b/src/ci/docker/dist-android/Dockerfile @@ -1,22 +1,8 @@ FROM ubuntu:16.04 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - cmake \ - curl \ - file \ - g++ \ - git \ - libssl-dev \ - make \ - pkg-config \ - python2.7 \ - sudo \ - unzip \ - xz-utils - -# dumb-init +COPY scripts/android-base-apt-get.sh /scripts/ +RUN sh /scripts/android-base-apt-get.sh + COPY scripts/dumb-init.sh /scripts/ RUN sh /scripts/dumb-init.sh @@ -48,9 +34,7 @@ ENV RUST_CONFIGURE_ARGS \ ENV SCRIPT python2.7 ../x.py dist --target $TARGETS -# cache COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -# init ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/src/ci/docker/dist-arm-linux/Dockerfile b/src/ci/docker/dist-arm-linux/Dockerfile index 862818a7c9182..590d6eb98b382 100644 --- a/src/ci/docker/dist-arm-linux/Dockerfile +++ b/src/ci/docker/dist-arm-linux/Dockerfile @@ -1,58 +1,23 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - automake \ - bison \ - bzip2 \ - ca-certificates \ - cmake \ - curl \ - file \ - flex \ - g++ \ - gawk \ - gdb \ - git \ - gperf \ - help2man \ - libncurses-dev \ - libtool-bin \ - make \ - patch \ - python2.7 \ - sudo \ - texinfo \ - wget \ - xz-utils \ - libssl-dev \ - pkg-config +COPY scripts/cross-apt-packages.sh /scripts/ +RUN sh /scripts/cross-apt-packages.sh + +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh -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", "--"] -# Ubuntu 16.04 (this contianer) ships with make 4, but something in the +# Ubuntu 16.04 (this container) ships with make 4, but something in the # toolchains we build below chokes on that, so go back to make 3 -RUN curl https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf - && \ - cd make-3.81 && \ - ./configure --prefix=/usr && \ - make && \ - make install && \ - cd .. && \ - rm -rf make-3.81 +COPY scripts/make3.sh /scripts/ +RUN sh /scripts/make3.sh -RUN curl http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2 | \ - tar xjf - && \ - cd crosstool-ng && \ - ./configure --prefix=/usr/local && \ - make -j$(nproc) && \ - make install && \ - cd .. && \ - rm -rf crosstool-ng +COPY scripts/crosstool-ng.sh /scripts/ +RUN sh /scripts/crosstool-ng.sh -RUN groupadd -r rustbuild && useradd -m -r -g rustbuild rustbuild -RUN mkdir /x-tools && chown rustbuild:rustbuild /x-tools +COPY scripts/rustbuild-setup.sh /scripts/ +RUN sh /scripts/rustbuild-setup.sh USER rustbuild WORKDIR /tmp @@ -61,9 +26,8 @@ RUN ./build-toolchains.sh USER root -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV PATH=$PATH:/x-tools/arm-unknown-linux-gnueabi/bin diff --git a/src/ci/docker/dist-armhf-linux/Dockerfile b/src/ci/docker/dist-armhf-linux/Dockerfile index 7f1f91f844c77..b3dedc4b7f0fe 100644 --- a/src/ci/docker/dist-armhf-linux/Dockerfile +++ b/src/ci/docker/dist-armhf-linux/Dockerfile @@ -1,58 +1,23 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - automake \ - bison \ - bzip2 \ - ca-certificates \ - cmake \ - curl \ - file \ - flex \ - g++ \ - gawk \ - gdb \ - git \ - gperf \ - help2man \ - libncurses-dev \ - libtool-bin \ - make \ - patch \ - python2.7 \ - sudo \ - texinfo \ - wget \ - xz-utils \ - libssl-dev \ - pkg-config +COPY scripts/cross-apt-packages.sh /scripts/ +RUN sh /scripts/cross-apt-packages.sh + +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh -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", "--"] -# Ubuntu 16.04 (this contianer) ships with make 4, but something in the +# Ubuntu 16.04 (this container) ships with make 4, but something in the # toolchains we build below chokes on that, so go back to make 3 -RUN curl https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf - && \ - cd make-3.81 && \ - ./configure --prefix=/usr && \ - make && \ - make install && \ - cd .. && \ - rm -rf make-3.81 +COPY scripts/make3.sh /scripts/ +RUN sh /scripts/make3.sh -RUN curl http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2 | \ - tar xjf - && \ - cd crosstool-ng && \ - ./configure --prefix=/usr/local && \ - make -j$(nproc) && \ - make install && \ - cd .. && \ - rm -rf crosstool-ng +COPY scripts/crosstool-ng.sh /scripts/ +RUN sh /scripts/crosstool-ng.sh -RUN groupadd -r rustbuild && useradd -m -r -g rustbuild rustbuild -RUN mkdir /x-tools && chown rustbuild:rustbuild /x-tools +COPY scripts/rustbuild-setup.sh /scripts/ +RUN sh /scripts/rustbuild-setup.sh USER rustbuild WORKDIR /tmp @@ -61,9 +26,8 @@ RUN ./build-toolchains.sh USER root -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV PATH=$PATH:/x-tools/arm-unknown-linux-gnueabihf/bin diff --git a/src/ci/docker/dist-armv7-linux/Dockerfile b/src/ci/docker/dist-armv7-linux/Dockerfile index 030fd24ebcdd0..82536b68bbe06 100644 --- a/src/ci/docker/dist-armv7-linux/Dockerfile +++ b/src/ci/docker/dist-armv7-linux/Dockerfile @@ -1,58 +1,23 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - automake \ - bison \ - bzip2 \ - ca-certificates \ - cmake \ - curl \ - file \ - flex \ - g++ \ - gawk \ - gdb \ - git \ - gperf \ - help2man \ - libncurses-dev \ - libtool-bin \ - make \ - patch \ - python2.7 \ - sudo \ - texinfo \ - wget \ - xz-utils \ - libssl-dev \ - pkg-config +COPY scripts/cross-apt-packages.sh /scripts/ +RUN sh /scripts/cross-apt-packages.sh + +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh -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", "--"] -# Ubuntu 16.04 (this contianer) ships with make 4, but something in the +# Ubuntu 16.04 (this container) ships with make 4, but something in the # toolchains we build below chokes on that, so go back to make 3 -RUN curl https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf - && \ - cd make-3.81 && \ - ./configure --prefix=/usr && \ - make && \ - make install && \ - cd .. && \ - rm -rf make-3.81 +COPY scripts/make3.sh /scripts/ +RUN sh /scripts/make3.sh -RUN curl http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2 | \ - tar xjf - && \ - cd crosstool-ng && \ - ./configure --prefix=/usr/local && \ - make -j$(nproc) && \ - make install && \ - cd .. && \ - rm -rf crosstool-ng +COPY scripts/crosstool-ng.sh /scripts/ +RUN sh /scripts/crosstool-ng.sh -RUN groupadd -r rustbuild && useradd -m -r -g rustbuild rustbuild -RUN mkdir /x-tools && chown rustbuild:rustbuild /x-tools +COPY scripts/rustbuild-setup.sh /scripts/ +RUN sh /scripts/rustbuild-setup.sh USER rustbuild WORKDIR /tmp @@ -61,9 +26,8 @@ RUN ./build-toolchains.sh USER root -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV PATH=$PATH:/x-tools/armv7-unknown-linux-gnueabihf/bin diff --git a/src/ci/docker/dist-fuchsia/Dockerfile b/src/ci/docker/dist-fuchsia/Dockerfile index d1d9767d35e63..24ad12a49007c 100644 --- a/src/ci/docker/dist-fuchsia/Dockerfile +++ b/src/ci/docker/dist-fuchsia/Dockerfile @@ -24,14 +24,13 @@ WORKDIR /tmp COPY dist-fuchsia/shared.sh dist-fuchsia/build-toolchain.sh dist-fuchsia/compiler-rt-dso-handle.patch /tmp/ RUN /tmp/build-toolchain.sh -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + ENTRYPOINT ["/usr/bin/dumb-init", "--"] -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV \ AR_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-ar \ diff --git a/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile b/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile index 805d238de1f9b..036dce2a73526 100644 --- a/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile +++ b/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile @@ -20,14 +20,13 @@ WORKDIR /build/ COPY dist-i586-gnu-i686-musl/musl-libunwind-patch.patch dist-i586-gnu-i686-musl/build-musl.sh /build/ RUN sh /build/build-musl.sh && rm -rf /build -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + ENTRYPOINT ["/usr/bin/dumb-init", "--"] -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV RUST_CONFIGURE_ARGS \ --target=i686-unknown-linux-musl,i586-unknown-linux-gnu \ diff --git a/src/ci/docker/dist-i686-freebsd/Dockerfile b/src/ci/docker/dist-i686-freebsd/Dockerfile index 9c4d43bfa92bc..c40881332a108 100644 --- a/src/ci/docker/dist-i686-freebsd/Dockerfile +++ b/src/ci/docker/dist-i686-freebsd/Dockerfile @@ -19,14 +19,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY dist-i686-freebsd/build-toolchain.sh /tmp/ RUN /tmp/build-toolchain.sh i686 -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + ENTRYPOINT ["/usr/bin/dumb-init", "--"] -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV \ AR_i686_unknown_freebsd=i686-unknown-freebsd10-ar \ diff --git a/src/ci/docker/dist-i686-linux/Dockerfile b/src/ci/docker/dist-i686-linux/Dockerfile index 9145e9dfc8d1a..beb53783bac40 100644 --- a/src/ci/docker/dist-i686-linux/Dockerfile +++ b/src/ci/docker/dist-i686-linux/Dockerfile @@ -81,9 +81,8 @@ RUN curl -Lo /rustroot/dumb-init \ chmod +x /rustroot/dumb-init ENTRYPOINT ["/rustroot/dumb-init", "--"] -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV HOSTS=i686-unknown-linux-gnu diff --git a/src/ci/docker/dist-mips-linux/Dockerfile b/src/ci/docker/dist-mips-linux/Dockerfile index c23240f0c70f9..81997e0508ac5 100644 --- a/src/ci/docker/dist-mips-linux/Dockerfile +++ b/src/ci/docker/dist-mips-linux/Dockerfile @@ -16,13 +16,13 @@ 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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + ENTRYPOINT ["/usr/bin/dumb-init", "--"] ENV HOSTS=mips-unknown-linux-gnu diff --git a/src/ci/docker/dist-mips64-linux/Dockerfile b/src/ci/docker/dist-mips64-linux/Dockerfile index 415dca99d95ee..646cb4d256ac0 100644 --- a/src/ci/docker/dist-mips64-linux/Dockerfile +++ b/src/ci/docker/dist-mips64-linux/Dockerfile @@ -16,13 +16,12 @@ 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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh -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", "--"] ENV HOSTS=mips64-unknown-linux-gnuabi64 diff --git a/src/ci/docker/dist-mips64el-linux/Dockerfile b/src/ci/docker/dist-mips64el-linux/Dockerfile index 2aba5f615baba..1abb04fd8b286 100644 --- a/src/ci/docker/dist-mips64el-linux/Dockerfile +++ b/src/ci/docker/dist-mips64el-linux/Dockerfile @@ -16,13 +16,13 @@ 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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + ENTRYPOINT ["/usr/bin/dumb-init", "--"] ENV HOSTS=mips64el-unknown-linux-gnuabi64 diff --git a/src/ci/docker/dist-mipsel-linux/Dockerfile b/src/ci/docker/dist-mipsel-linux/Dockerfile index d15e3010863c4..a78e39e7d7129 100644 --- a/src/ci/docker/dist-mipsel-linux/Dockerfile +++ b/src/ci/docker/dist-mipsel-linux/Dockerfile @@ -16,13 +16,12 @@ 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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh -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", "--"] ENV HOSTS=mipsel-unknown-linux-gnu diff --git a/src/ci/docker/dist-powerpc-linux/Dockerfile b/src/ci/docker/dist-powerpc-linux/Dockerfile index 0074665f34f7e..ed9f883cc83f7 100644 --- a/src/ci/docker/dist-powerpc-linux/Dockerfile +++ b/src/ci/docker/dist-powerpc-linux/Dockerfile @@ -1,58 +1,23 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - automake \ - bison \ - bzip2 \ - ca-certificates \ - cmake \ - curl \ - file \ - flex \ - g++ \ - gawk \ - gdb \ - git \ - gperf \ - help2man \ - libncurses-dev \ - libtool-bin \ - make \ - patch \ - python2.7 \ - sudo \ - texinfo \ - wget \ - xz-utils \ - libssl-dev \ - pkg-config +COPY scripts/cross-apt-packages.sh /scripts/ +RUN sh /scripts/cross-apt-packages.sh + +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh -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", "--"] -# Ubuntu 16.04 (this contianer) ships with make 4, but something in the +# Ubuntu 16.04 (this container) ships with make 4, but something in the # toolchains we build below chokes on that, so go back to make 3 -RUN curl https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf - && \ - cd make-3.81 && \ - ./configure --prefix=/usr && \ - make && \ - make install && \ - cd .. && \ - rm -rf make-3.81 +COPY scripts/make3.sh /scripts/ +RUN sh /scripts/make3.sh -RUN curl http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2 | \ - tar xjf - && \ - cd crosstool-ng && \ - ./configure --prefix=/usr/local && \ - make -j$(nproc) && \ - make install && \ - cd .. && \ - rm -rf crosstool-ng +COPY scripts/crosstool-ng.sh /scripts/ +RUN sh /scripts/crosstool-ng.sh -RUN groupadd -r rustbuild && useradd -m -r -g rustbuild rustbuild -RUN mkdir /x-tools && chown rustbuild:rustbuild /x-tools +COPY scripts/rustbuild-setup.sh /scripts/ +RUN sh /scripts/rustbuild-setup.sh USER rustbuild WORKDIR /tmp @@ -62,9 +27,8 @@ RUN ./build-powerpc-toolchain.sh USER root -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV PATH=$PATH:/x-tools/powerpc-unknown-linux-gnu/bin diff --git a/src/ci/docker/dist-powerpc64-linux/Dockerfile b/src/ci/docker/dist-powerpc64-linux/Dockerfile index bd38ee0c11158..523211498fb43 100644 --- a/src/ci/docker/dist-powerpc64-linux/Dockerfile +++ b/src/ci/docker/dist-powerpc64-linux/Dockerfile @@ -1,58 +1,23 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - automake \ - bison \ - bzip2 \ - ca-certificates \ - cmake \ - curl \ - file \ - flex \ - g++ \ - gawk \ - gdb \ - git \ - gperf \ - help2man \ - libncurses-dev \ - libtool-bin \ - make \ - patch \ - python2.7 \ - sudo \ - texinfo \ - wget \ - xz-utils \ - libssl-dev \ - pkg-config +COPY scripts/cross-apt-packages.sh /scripts/ +RUN sh /scripts/cross-apt-packages.sh + +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh -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", "--"] -# Ubuntu 16.04 (this contianer) ships with make 4, but something in the +# Ubuntu 16.04 (this container) ships with make 4, but something in the # toolchains we build below chokes on that, so go back to make 3 -RUN curl https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf - && \ - cd make-3.81 && \ - ./configure --prefix=/usr && \ - make && \ - make install && \ - cd .. && \ - rm -rf make-3.81 +COPY scripts/make3.sh /scripts/ +RUN sh /scripts/make3.sh -RUN curl http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2 | \ - tar xjf - && \ - cd crosstool-ng && \ - ./configure --prefix=/usr/local && \ - make -j$(nproc) && \ - make install && \ - cd .. && \ - rm -rf crosstool-ng +COPY scripts/crosstool-ng.sh /scripts/ +RUN sh /scripts/crosstool-ng.sh -RUN groupadd -r rustbuild && useradd -m -r -g rustbuild rustbuild -RUN mkdir /x-tools && chown rustbuild:rustbuild /x-tools +COPY scripts/rustbuild-setup.sh /scripts/ +RUN sh /scripts/rustbuild-setup.sh USER rustbuild WORKDIR /tmp @@ -62,9 +27,8 @@ RUN ./build-powerpc64-toolchain.sh USER root -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV PATH=$PATH:/x-tools/powerpc64-unknown-linux-gnu/bin diff --git a/src/ci/docker/dist-powerpc64le-linux/Dockerfile b/src/ci/docker/dist-powerpc64le-linux/Dockerfile index cbded156b4cbd..06b262c515a24 100644 --- a/src/ci/docker/dist-powerpc64le-linux/Dockerfile +++ b/src/ci/docker/dist-powerpc64le-linux/Dockerfile @@ -1,58 +1,23 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - automake \ - bison \ - bzip2 \ - ca-certificates \ - cmake \ - curl \ - file \ - flex \ - g++ \ - gawk \ - gdb \ - git \ - gperf \ - help2man \ - libncurses-dev \ - libtool-bin \ - make \ - patch \ - python2.7 \ - sudo \ - texinfo \ - wget \ - xz-utils \ - libssl-dev \ - pkg-config +COPY scripts/cross-apt-packages.sh /scripts/ +RUN sh /scripts/cross-apt-packages.sh + +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh -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", "--"] -# Ubuntu 16.04 (this contianer) ships with make 4, but something in the +# Ubuntu 16.04 (this container) ships with make 4, but something in the # toolchains we build below chokes on that, so go back to make 3 -RUN curl https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf - && \ - cd make-3.81 && \ - ./configure --prefix=/usr && \ - make && \ - make install && \ - cd .. && \ - rm -rf make-3.81 +COPY scripts/make3.sh /scripts/ +RUN sh /scripts/make3.sh -RUN curl http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2 | \ - tar xjf - && \ - cd crosstool-ng && \ - ./configure --prefix=/usr/local && \ - make -j$(nproc) && \ - make install && \ - cd .. && \ - rm -rf crosstool-ng +COPY scripts/crosstool-ng.sh /scripts/ +RUN sh /scripts/crosstool-ng.sh -RUN groupadd -r rustbuild && useradd -m -r -g rustbuild rustbuild -RUN mkdir /x-tools && chown rustbuild:rustbuild /x-tools +COPY scripts/rustbuild-setup.sh /scripts/ +RUN sh /scripts/rustbuild-setup.sh USER rustbuild WORKDIR /tmp @@ -62,9 +27,8 @@ RUN apt-get install -y --no-install-recommends rpm2cpio cpio COPY dist-powerpc64le-linux/shared.sh dist-powerpc64le-linux/build-powerpc64le-toolchain.sh /tmp/ RUN ./build-powerpc64le-toolchain.sh -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV \ AR_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-ar \ diff --git a/src/ci/docker/dist-s390x-linux/Dockerfile b/src/ci/docker/dist-s390x-linux/Dockerfile index 5c00287107aa3..84769af12b5a6 100644 --- a/src/ci/docker/dist-s390x-linux/Dockerfile +++ b/src/ci/docker/dist-s390x-linux/Dockerfile @@ -1,58 +1,23 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - automake \ - bison \ - bzip2 \ - ca-certificates \ - cmake \ - curl \ - file \ - flex \ - g++ \ - gawk \ - gdb \ - git \ - gperf \ - help2man \ - libncurses-dev \ - libtool-bin \ - make \ - patch \ - python2.7 \ - sudo \ - texinfo \ - wget \ - xz-utils \ - libssl-dev \ - pkg-config +COPY scripts/cross-apt-packages.sh /scripts/ +RUN sh /scripts/cross-apt-packages.sh + +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh -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", "--"] -# Ubuntu 16.04 (this contianer) ships with make 4, but something in the +# Ubuntu 16.04 (this container) ships with make 4, but something in the # toolchains we build below chokes on that, so go back to make 3 -RUN curl https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf - && \ - cd make-3.81 && \ - ./configure --prefix=/usr && \ - make && \ - make install && \ - cd .. && \ - rm -rf make-3.81 +COPY scripts/make3.sh /scripts/ +RUN sh /scripts/make3.sh -RUN curl http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2 | \ - tar xjf - && \ - cd crosstool-ng && \ - ./configure --prefix=/usr/local && \ - make -j$(nproc) && \ - make install && \ - cd .. && \ - rm -rf crosstool-ng +COPY scripts/crosstool-ng.sh /scripts/ +RUN sh /scripts/crosstool-ng.sh -RUN groupadd -r rustbuild && useradd -m -r -g rustbuild rustbuild -RUN mkdir /x-tools && chown rustbuild:rustbuild /x-tools +COPY scripts/rustbuild-setup.sh /scripts/ +RUN sh /scripts/rustbuild-setup.sh USER rustbuild WORKDIR /tmp @@ -62,9 +27,8 @@ RUN ./build-s390x-toolchain.sh USER root -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV PATH=$PATH:/x-tools/s390x-ibm-linux-gnu/bin diff --git a/src/ci/docker/dist-x86_64-freebsd/Dockerfile b/src/ci/docker/dist-x86_64-freebsd/Dockerfile index a6c4eee5e812c..b62b46701a764 100644 --- a/src/ci/docker/dist-x86_64-freebsd/Dockerfile +++ b/src/ci/docker/dist-x86_64-freebsd/Dockerfile @@ -19,14 +19,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY dist-x86_64-freebsd/build-toolchain.sh /tmp/ RUN /tmp/build-toolchain.sh x86_64 -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + ENTRYPOINT ["/usr/bin/dumb-init", "--"] -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV \ AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-ar \ diff --git a/src/ci/docker/dist-x86_64-linux/Dockerfile b/src/ci/docker/dist-x86_64-linux/Dockerfile index 78b62839a35d5..d0ab47ad3dcd8 100644 --- a/src/ci/docker/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/dist-x86_64-linux/Dockerfile @@ -81,9 +81,8 @@ RUN curl -Lo /rustroot/dumb-init \ chmod +x /rustroot/dumb-init ENTRYPOINT ["/rustroot/dumb-init", "--"] -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV HOSTS=x86_64-unknown-linux-gnu diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile index 2eea5ab146972..eebc283e96642 100644 --- a/src/ci/docker/dist-x86_64-musl/Dockerfile +++ b/src/ci/docker/dist-x86_64-musl/Dockerfile @@ -20,14 +20,13 @@ WORKDIR /build/ COPY dist-x86_64-musl/build-musl.sh /build/ RUN sh /build/build-musl.sh && rm -rf /build -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + ENTRYPOINT ["/usr/bin/dumb-init", "--"] -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV RUST_CONFIGURE_ARGS \ --target=x86_64-unknown-linux-musl \ diff --git a/src/ci/docker/dist-x86_64-netbsd/Dockerfile b/src/ci/docker/dist-x86_64-netbsd/Dockerfile index f76e6271f4c8c..0c1405002666b 100644 --- a/src/ci/docker/dist-x86_64-netbsd/Dockerfile +++ b/src/ci/docker/dist-x86_64-netbsd/Dockerfile @@ -1,58 +1,23 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - automake \ - bison \ - bzip2 \ - ca-certificates \ - cmake \ - curl \ - file \ - flex \ - g++ \ - gawk \ - gdb \ - git \ - gperf \ - help2man \ - libncurses-dev \ - libtool-bin \ - make \ - patch \ - python2.7 \ - sudo \ - texinfo \ - wget \ - xz-utils \ - libssl-dev \ - pkg-config +COPY scripts/cross-apt-packages.sh /scripts/ +RUN sh /scripts/cross-apt-packages.sh + +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh -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", "--"] -# Ubuntu 16.04 (this contianer) ships with make 4, but something in the +# Ubuntu 16.04 (this container) ships with make 4, but something in the # toolchains we build below chokes on that, so go back to make 3 -RUN curl https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf - && \ - cd make-3.81 && \ - ./configure --prefix=/usr && \ - make && \ - make install && \ - cd .. && \ - rm -rf make-3.81 +COPY scripts/make3.sh /scripts/ +RUN sh /scripts/make3.sh -RUN curl http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2 | \ - tar xjf - && \ - cd crosstool-ng && \ - ./configure --prefix=/usr/local && \ - make -j$(nproc) && \ - make install && \ - cd .. && \ - rm -rf crosstool-ng +COPY scripts/crosstool-ng.sh /scripts/ +RUN sh /scripts/crosstool-ng.sh -RUN groupadd -r rustbuild && useradd -m -r -g rustbuild rustbuild -RUN mkdir /x-tools && chown rustbuild:rustbuild /x-tools +COPY scripts/rustbuild-setup.sh /scripts/ +RUN sh /scripts/rustbuild-setup.sh USER rustbuild WORKDIR /tmp @@ -61,9 +26,8 @@ RUN ./build-netbsd-toolchain.sh USER root -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 +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh ENV PATH=$PATH:/x-tools/x86_64-unknown-netbsd/bin diff --git a/src/ci/docker/i686-gnu-nopt/Dockerfile b/src/ci/docker/i686-gnu-nopt/Dockerfile index 076be8f429116..56ff9922ae347 100644 --- a/src/ci/docker/i686-gnu-nopt/Dockerfile +++ b/src/ci/docker/i686-gnu-nopt/Dockerfile @@ -13,13 +13,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ xz-utils -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + ENTRYPOINT ["/usr/bin/dumb-init", "--"] ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests diff --git a/src/ci/docker/i686-gnu/Dockerfile b/src/ci/docker/i686-gnu/Dockerfile index 5fac057357467..1c1333cd7c84f 100644 --- a/src/ci/docker/i686-gnu/Dockerfile +++ b/src/ci/docker/i686-gnu/Dockerfile @@ -13,13 +13,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ xz-utils -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + ENTRYPOINT ["/usr/bin/dumb-init", "--"] ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu diff --git a/src/ci/docker/scripts/android-base-apt-get.sh b/src/ci/docker/scripts/android-base-apt-get.sh new file mode 100644 index 0000000000000..7ae3bf39a3832 --- /dev/null +++ b/src/ci/docker/scripts/android-base-apt-get.sh @@ -0,0 +1,27 @@ +# 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 + +apt-get update +apt-get install -y --no-install-recommends \ + ca-certificates \ + cmake \ + curl \ + file \ + g++ \ + git \ + libssl-dev \ + make \ + pkg-config \ + python2.7 \ + sudo \ + unzip \ + xz-utils diff --git a/src/ci/docker/scripts/cross-apt-packages.sh b/src/ci/docker/scripts/cross-apt-packages.sh new file mode 100644 index 0000000000000..f6c9cc960c56d --- /dev/null +++ b/src/ci/docker/scripts/cross-apt-packages.sh @@ -0,0 +1,36 @@ +# 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. + +apt-get update && apt-get install -y --no-install-recommends \ + automake \ + bison \ + bzip2 \ + ca-certificates \ + cmake \ + curl \ + file \ + flex \ + g++ \ + gawk \ + gdb \ + git \ + gperf \ + help2man \ + libncurses-dev \ + libssl-dev \ + libtool-bin \ + make \ + patch \ + pkg-config \ + python2.7 \ + sudo \ + texinfo \ + wget \ + xz-utils diff --git a/src/ci/docker/scripts/crosstool-ng.sh b/src/ci/docker/scripts/crosstool-ng.sh new file mode 100644 index 0000000000000..8b2747cf21309 --- /dev/null +++ b/src/ci/docker/scripts/crosstool-ng.sh @@ -0,0 +1,20 @@ +# 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 + +url="http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2" +curl $url | tar xjf - +cd crosstool-ng +./configure --prefix=/usr/local +make -j$(nproc) +make install +cd .. +rm -rf crosstool-ng diff --git a/src/ci/docker/scripts/make3.sh b/src/ci/docker/scripts/make3.sh new file mode 100644 index 0000000000000..8a7845cb8f384 --- /dev/null +++ b/src/ci/docker/scripts/make3.sh @@ -0,0 +1,19 @@ +# 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 + +curl https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf - +cd make-3.81 +./configure --prefix=/usr +make +make install +cd .. +rm -rf make-3.81 diff --git a/src/ci/docker/scripts/rustbuild-setup.sh b/src/ci/docker/scripts/rustbuild-setup.sh new file mode 100644 index 0000000000000..96efccfdff386 --- /dev/null +++ b/src/ci/docker/scripts/rustbuild-setup.sh @@ -0,0 +1,14 @@ +# 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 + +groupadd -r rustbuild && useradd -m -r -g rustbuild rustbuild +mkdir /x-tools && chown rustbuild:rustbuild /x-tools diff --git a/src/ci/docker/x86_64-gnu-aux/Dockerfile b/src/ci/docker/x86_64-gnu-aux/Dockerfile index 06c7c2824fd9d..a449526efcce2 100644 --- a/src/ci/docker/x86_64-gnu-aux/Dockerfile +++ b/src/ci/docker/x86_64-gnu-aux/Dockerfile @@ -14,13 +14,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ xz-utils \ 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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh -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", "--"] ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu diff --git a/src/ci/docker/x86_64-gnu-debug/Dockerfile b/src/ci/docker/x86_64-gnu-debug/Dockerfile index 6ea54ac4db3e7..8111118ad3d91 100644 --- a/src/ci/docker/x86_64-gnu-debug/Dockerfile +++ b/src/ci/docker/x86_64-gnu-debug/Dockerfile @@ -13,13 +13,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ xz-utils -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh -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", "--"] ENV RUST_CONFIGURE_ARGS \ diff --git a/src/ci/docker/x86_64-gnu-distcheck/Dockerfile b/src/ci/docker/x86_64-gnu-distcheck/Dockerfile index e24c660a8c36d..c3fe8ea51cb3f 100644 --- a/src/ci/docker/x86_64-gnu-distcheck/Dockerfile +++ b/src/ci/docker/x86_64-gnu-distcheck/Dockerfile @@ -15,13 +15,12 @@ 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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh -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", "--"] ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu diff --git a/src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile b/src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile index 78035c7fe3d7f..377e086955779 100644 --- a/src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile +++ b/src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile @@ -13,13 +13,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ xz-utils -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh -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", "--"] ENV RUST_CONFIGURE_ARGS \ diff --git a/src/ci/docker/x86_64-gnu-incremental/Dockerfile b/src/ci/docker/x86_64-gnu-incremental/Dockerfile index 0aaed64e384ed..a21a99e965e83 100644 --- a/src/ci/docker/x86_64-gnu-incremental/Dockerfile +++ b/src/ci/docker/x86_64-gnu-incremental/Dockerfile @@ -13,13 +13,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ xz-utils -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh -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", "--"] ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu diff --git a/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile index 7c136fa39bc8b..1a9f1d2d737b8 100644 --- a/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile +++ b/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile @@ -16,13 +16,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ zlib1g-dev \ xz-utils -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh -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", "--"] ENV RUST_CONFIGURE_ARGS \ diff --git a/src/ci/docker/x86_64-gnu-nopt/Dockerfile b/src/ci/docker/x86_64-gnu-nopt/Dockerfile index 4499736967cf4..e008b21f66fe2 100644 --- a/src/ci/docker/x86_64-gnu-nopt/Dockerfile +++ b/src/ci/docker/x86_64-gnu-nopt/Dockerfile @@ -13,13 +13,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ xz-utils -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh -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", "--"] ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --disable-optimize-tests diff --git a/src/ci/docker/x86_64-gnu/Dockerfile b/src/ci/docker/x86_64-gnu/Dockerfile index 0bbbded57f27d..3a6760b476225 100644 --- a/src/ci/docker/x86_64-gnu/Dockerfile +++ b/src/ci/docker/x86_64-gnu/Dockerfile @@ -13,13 +13,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ xz-utils -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 +COPY scripts/dumb-init.sh /scripts/ +RUN sh /scripts/dumb-init.sh + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh -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", "--"] ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --enable-sanitizers --enable-profiler