From 7393de94f7efd87e76ed3e6fcb39f1efe6fba334 Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 20 Jun 2016 11:02:31 +0200 Subject: [PATCH] docker uses rustup, fixes #1337 --- docker/ubuntu-arm/Dockerfile | 14 +++++++++----- docker/ubuntu-dev/Dockerfile | 8 ++++---- docker/ubuntu-jit/Dockerfile | 8 ++++---- docker/ubuntu/Dockerfile | 8 ++++---- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/docker/ubuntu-arm/Dockerfile b/docker/ubuntu-arm/Dockerfile index 9678912cba4..fd77f182edd 100644 --- a/docker/ubuntu-arm/Dockerfile +++ b/docker/ubuntu-arm/Dockerfile @@ -9,18 +9,22 @@ RUN apt-get -y update && \ && \ apt-get clean -# install multirust -RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes +# install rustup +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y + +# rustup directory +ENV PATH /root/.cargo/bin:$PATH + ENV RUST_TARGETS="arm-unknown-linux-gnueabihf" # multirust add arm--linux-gnuabhf toolchain -RUN multirust add-target stable arm-unknown-linux-gnueabihf +RUN rustup target add stable arm-unknown-linux-gnueabihf # show backtraces ENV RUST_BACKTRACE 1 # set compilers -ENV CXX arm-linux-gnueabihf-g++ -ENV CC arm-linux-gnueabihf-gcc +ENV CXX arm-linux-gnueabihf-g++ +ENV CC arm-linux-gnueabihf-gcc # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ diff --git a/docker/ubuntu-dev/Dockerfile b/docker/ubuntu-dev/Dockerfile index 05e8dfe8fed..72b4bb08eef 100644 --- a/docker/ubuntu-dev/Dockerfile +++ b/docker/ubuntu-dev/Dockerfile @@ -27,11 +27,11 @@ RUN git clone https://github.com/debris/evmjit && \ mkdir build && cd build && \ cmake .. && make && make install && cd -# install multirust -RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes +# install rustup +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y -# export rust LIBRARY_PATH -ENV LIBRARY_PATH /usr/local/lib +# rustup directory +ENV PATH /root/.cargo/bin:$PATH # show backtraces ENV RUST_BACKTRACE 1 diff --git a/docker/ubuntu-jit/Dockerfile b/docker/ubuntu-jit/Dockerfile index 138882d2bc3..37ef90d4e8e 100644 --- a/docker/ubuntu-jit/Dockerfile +++ b/docker/ubuntu-jit/Dockerfile @@ -27,11 +27,11 @@ RUN git clone https://github.com/debris/evmjit && \ mkdir build && cd build && \ cmake .. && make && make install && cd -# install multirust -RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes +# install rustup +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y -# export rust LIBRARY_PATH -ENV LIBRARY_PATH /usr/local/lib +# rustup directory +ENV PATH /root/.cargo/bin:$PATH # show backtraces ENV RUST_BACKTRACE 1 diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 38c628d0ed3..10477e01f71 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -8,11 +8,11 @@ RUN apt-get update && \ git \ make -# install multirust -RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes +# install rustup +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y -# export rust LIBRARY_PATH -ENV LIBRARY_PATH /usr/local/lib +# rustup directory +ENV PATH /root/.cargo/bin:$PATH # show backtraces ENV RUST_BACKTRACE 1