docker uses rustup, fixes #1337
This commit is contained in:
parent
bf6308312e
commit
7393de94f7
@ -9,18 +9,22 @@ RUN apt-get -y update && \
|
|||||||
&& \
|
&& \
|
||||||
apt-get clean
|
apt-get clean
|
||||||
|
|
||||||
# install multirust
|
# install rustup
|
||||||
RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
|
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"
|
ENV RUST_TARGETS="arm-unknown-linux-gnueabihf"
|
||||||
|
|
||||||
# multirust add arm--linux-gnuabhf toolchain
|
# 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
|
# 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
|
||||||
# build parity
|
# build parity
|
||||||
RUN git clone https://github.com/ethcore/parity && \
|
RUN git clone https://github.com/ethcore/parity && \
|
||||||
cd parity && \
|
cd parity && \
|
||||||
|
@ -27,11 +27,11 @@ RUN git clone https://github.com/debris/evmjit && \
|
|||||||
mkdir build && cd build && \
|
mkdir build && cd build && \
|
||||||
cmake .. && make && make install && cd
|
cmake .. && make && make install && cd
|
||||||
|
|
||||||
# install multirust
|
# install rustup
|
||||||
RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
|
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
|
||||||
|
|
||||||
# export rust LIBRARY_PATH
|
# rustup directory
|
||||||
ENV LIBRARY_PATH /usr/local/lib
|
ENV PATH /root/.cargo/bin:$PATH
|
||||||
|
|
||||||
# show backtraces
|
# show backtraces
|
||||||
ENV RUST_BACKTRACE 1
|
ENV RUST_BACKTRACE 1
|
||||||
|
@ -27,11 +27,11 @@ RUN git clone https://github.com/debris/evmjit && \
|
|||||||
mkdir build && cd build && \
|
mkdir build && cd build && \
|
||||||
cmake .. && make && make install && cd
|
cmake .. && make && make install && cd
|
||||||
|
|
||||||
# install multirust
|
# install rustup
|
||||||
RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
|
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
|
||||||
|
|
||||||
# export rust LIBRARY_PATH
|
# rustup directory
|
||||||
ENV LIBRARY_PATH /usr/local/lib
|
ENV PATH /root/.cargo/bin:$PATH
|
||||||
|
|
||||||
# show backtraces
|
# show backtraces
|
||||||
ENV RUST_BACKTRACE 1
|
ENV RUST_BACKTRACE 1
|
||||||
|
@ -8,11 +8,11 @@ RUN apt-get update && \
|
|||||||
git \
|
git \
|
||||||
make
|
make
|
||||||
|
|
||||||
# install multirust
|
# install rustup
|
||||||
RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
|
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
|
||||||
|
|
||||||
# export rust LIBRARY_PATH
|
# rustup directory
|
||||||
ENV LIBRARY_PATH /usr/local/lib
|
ENV PATH /root/.cargo/bin:$PATH
|
||||||
|
|
||||||
# show backtraces
|
# show backtraces
|
||||||
ENV RUST_BACKTRACE 1
|
ENV RUST_BACKTRACE 1
|
||||||
|
Loading…
Reference in New Issue
Block a user