From 4fd0a951127bfbcc4471c3b5288251702b28d4ad Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Sat, 25 Jun 2016 02:58:06 +0700
Subject: [PATCH] Update Ubuntu-arm Dockerfile

Update Ubuntu-arm Dockerfile
[ci skip]
---
 docker/ubuntu-arm/Dockerfile | 51 +++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/docker/ubuntu-arm/Dockerfile b/docker/ubuntu-arm/Dockerfile
index fd77f182e..fab325e5e 100644
--- a/docker/ubuntu-arm/Dockerfile
+++ b/docker/ubuntu-arm/Dockerfile
@@ -2,11 +2,11 @@ FROM ubuntu:14.04
 WORKDIR /build
 # install tools and dependencies
 RUN apt-get -y update && \
-	apt-get install -y --force-yes --no-install-recommends \
-	curl git make g++ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
-	libc6-dev-armhf-cross wget file ca-certificates \
-	binutils-arm-linux-gnueabihf \
-	&& \
+        apt-get install -y --force-yes --no-install-recommends \
+        curl git make g++ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
+        libc6-dev-armhf-cross wget file ca-certificates \
+        binutils-arm-linux-gnueabihf \
+        && \
     apt-get clean
 
 # install rustup
@@ -18,33 +18,30 @@ ENV PATH /root/.cargo/bin:$PATH
 ENV RUST_TARGETS="arm-unknown-linux-gnueabihf"
 
 # multirust add arm--linux-gnuabhf toolchain
-RUN rustup target add stable arm-unknown-linux-gnueabihf
+RUN rustup target add armv7-unknown-linux-gnueabihf
 
 # show backtraces
 ENV RUST_BACKTRACE 1
+
 # set compilers
 ENV CXX arm-linux-gnueabihf-g++
 ENV CC arm-linux-gnueabihf-gcc
+
+# show tools
+ RUN rustc -vV && \
+ cargo -V && \
+ gcc -v &&\
+ g++ -v
+
 # build parity
 RUN git clone https://github.com/ethcore/parity && \
-	cd parity && \
-	git checkout master && \
-	wget https://github.com/nix-rust/nix/archive/v0.5.0.tar.gz && \
-	tar -xf v0.5.0.tar.gz && \
-	rm -rf v0.5.0.tar.gz && \
-	wget https://github.com/thkaw/mio/archive/v0.5.x.tar.gz && \
-	tar -xf v0.5.x.tar.gz && \
-	rm -rf v0.5.x.tar.gz && \
-	mkdir -p .cargo && \
-  	echo 'paths = ["nix-0.5.0","mio-0.5.x"]\n\
-	[target.arm-unknown-linux-gnueabihf]\n\
-	linker = "arm-linux-gnueabihf-gcc"\n'\
-	>>.cargo/config && \
-	cat .cargo/config && \
-	rustc -vV && \
-	cargo -V && \
-	cargo build --target arm-unknown-linux-gnueabihf --release --verbose && \
-	ls /build/parity/target/arm-unknown-linux-gnueabihf/release/parity &&	\
-	file /build/parity/target/arm-unknown-linux-gnueabihf/release/parity && \
-	/usr/bin/arm-linux-gnueabihf-strip /build/parity/target/arm-unknown-linux-gnueabihf/release/parity
-RUN file /build/parity/target/arm-unknown-linux-gnueabihf/release/parity
+        cd parity && \
+        mkdir -p .cargo && \
+        echo '[target.armv7-unknown-linux-gnueabihf]\n\
+        linker = "arm-linux-gnueabihf-gcc"\n'\
+        >>.cargo/config && \
+        cat .cargo/config && \
+        cargo build --target armv7-unknown-linux-gnueabihf --release --verbose && \
+        ls /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity && \
+        /usr/bin/arm-linux-gnueabihf-strip /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
+RUN file /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity