Skip to content

Commit

Permalink
Merge pull request #40 from dappnode/tropicar/update-cargo
Browse files Browse the repository at this point in the history
Update cargo
  • Loading branch information
tropicar authored Apr 12, 2022
2 parents c9c4081 + f5fa750 commit 5e5fd4a
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ RUN echo '# source urls for arm64 \n\
RUN apt-get -y update && \
apt-get upgrade -y && \
apt-get install -y --no-install-recommends \
curl make cmake file ca-certificates \
g++ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
libc6-dev-arm64-cross binutils-aarch64-linux-gnu \
libudev-dev libudev-dev:arm64 git \
&& \
curl make cmake file ca-certificates \
g++ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
libc6-dev-arm64-cross binutils-aarch64-linux-gnu \
libudev-dev libudev-dev:arm64 git \
&& \
apt-get clean

# install rustup
Expand All @@ -39,7 +39,7 @@ ENV PATH /root/.cargo/bin:$PATH
ENV RUST_BACKTRACE 1

# show tools
RUN rustup toolchain install 1.50.0 && rustup default 1.50.0 && rustc -vV && cargo -V
RUN rustup toolchain install 1.60.0 && rustup default 1.60.0 && rustc -vV && cargo -V

# build parity
RUN git clone -b ${UPSTREAM_VERSION} https://github.com/openethereum/openethereum /openethereum
Expand All @@ -49,10 +49,10 @@ RUN cd /openethereum && \
linker = "aarch64-linux-gnu-gcc"\n'\
>>.cargo/config && \
cat .cargo/config

RUN cd /openethereum && \
if [ "$TARGETARCH" = "arm64" ]; then export ARCH="aarch64"; else export ARCH="x86_64"; fi && \
rustup target add ${ARCH}-unknown-linux-gnu && \
rustup target add ${ARCH}-unknown-linux-gnu && \
cargo build --release --features final --target ${ARCH}-unknown-linux-gnu --verbose

RUN if [ "$TARGETARCH" = "arm64" ]; then export ARCH="aarch64"; else export ARCH="x86_64"; fi && \
Expand Down

0 comments on commit 5e5fd4a

Please sign in to comment.