Merge pull request #1429 from General-Beck/patch-7

Update Ubuntu-arm Dockerfile
This commit is contained in:
Arkadiy Paronyan 2016-06-24 22:53:33 +02:00 committed by GitHub
commit 482d910b15

View File

@ -18,33 +18,30 @@ ENV PATH /root/.cargo/bin:$PATH
ENV RUST_TARGETS="arm-unknown-linux-gnueabihf" ENV RUST_TARGETS="arm-unknown-linux-gnueabihf"
# multirust add arm--linux-gnuabhf toolchain # 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 # show backtraces
ENV RUST_BACKTRACE 1 ENV RUST_BACKTRACE 1
# set compilers # set compilers
ENV CXX arm-linux-gnueabihf-g++ ENV CXX arm-linux-gnueabihf-g++
ENV CC arm-linux-gnueabihf-gcc ENV CC arm-linux-gnueabihf-gcc
# show tools
RUN rustc -vV && \
cargo -V && \
gcc -v &&\
g++ -v
# build parity # build parity
RUN git clone https://github.com/ethcore/parity && \ RUN git clone https://github.com/ethcore/parity && \
cd 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 && \ mkdir -p .cargo && \
echo 'paths = ["nix-0.5.0","mio-0.5.x"]\n\ echo '[target.armv7-unknown-linux-gnueabihf]\n\
[target.arm-unknown-linux-gnueabihf]\n\
linker = "arm-linux-gnueabihf-gcc"\n'\ linker = "arm-linux-gnueabihf-gcc"\n'\
>>.cargo/config && \ >>.cargo/config && \
cat .cargo/config && \ cat .cargo/config && \
rustc -vV && \ cargo build --target armv7-unknown-linux-gnueabihf --release --verbose && \
cargo -V && \ ls /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity && \
cargo build --target arm-unknown-linux-gnueabihf --release --verbose && \ /usr/bin/arm-linux-gnueabihf-strip /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
ls /build/parity/target/arm-unknown-linux-gnueabihf/release/parity && \ RUN file /build/parity/target/armv7-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