Merge with master

docker/ubuntu/Dockerfile

@@ -1,23 +1,33 @@
 FROM ubuntu:14.04
-
+WORKDIR /build
 # install tools and dependencies
 RUN apt-get update && \
-	apt-get install -y \
-	g++ \
-	curl \
-	git \
-	make
+        apt-get install -y \
+        g++ \
+        curl \
+        git \
+        file \
+        binutils
 
-# 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
 
+# show tools
+RUN rustc -vV && \
+cargo -V && \
+gcc -v &&\
+g++ -v
+
 # build parity
 RUN git clone https://github.com/ethcore/parity && \
-	cd parity && \
-	cargo build --release
+        cd parity && \
+        cargo build --release --verbose && \
+        ls /build/parity/target/release/parity &&       \
+        strip /build/parity/target/release/parity
+RUN file /build/parity/target/release/parity