Merge pull request #1429 from General-Beck/patch-7
Update Ubuntu-arm Dockerfile
This commit is contained in:
commit
482d910b15
@ -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\
|
||||
echo '[target.armv7-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
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user