Merge pull request #1344 from ethcore/docker_rustup

docker uses rustup, fixes #1337

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 && \

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

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

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