Skip to content

Commit

Permalink
fix(release): fix broken release due to wrong rust version and resolv…
Browse files Browse the repository at this point in the history
…er conflit, remove the dockerfile caching as it is not used anyway.
  • Loading branch information
chefsale committed May 28, 2021
1 parent 4009a14 commit 40310e2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
6 changes: 1 addition & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,13 @@ COPY . .
ENV CARGO_TARGET_DIR=/tmp/target
ENV RUSTC_FLAGS='-C target-cpu=x86-64'
ENV PORTABLE=ON
RUN --mount=type=cache,target=/tmp/target \
--mount=type=cache,target=/usr/local/cargo/git \
--mount=type=cache,target=/usr/local/cargo/registry \
cargo +"$(cat /tmp/rust-toolchain)" build -p neard --release && \
RUN cargo +"$(cat /tmp/rust-toolchain)" build -p neard --release && \
mkdir /tmp/build && \
cd /tmp/target/release && \
mv ./neard /tmp/build

COPY scripts/run_docker.sh /tmp/build/run.sh


# Actual image
FROM ubuntu:18.04

Expand Down
5 changes: 1 addition & 4 deletions Dockerfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ COPY . .
ENV CARGO_TARGET_DIR=/tmp/target
ENV RUSTC_FLAGS='-C target-cpu=x86-64'
ENV PORTABLE=ON
RUN --mount=type=cache,target=/tmp/target \
--mount=type=cache,target=/usr/local/cargo/git \
--mount=type=cache,target=/usr/local/cargo/registry \
cargo +"$(cat /tmp/rust-toolchain)" build -p neard --release --features nightly_protocol --features nightly_protocol_features && \
RUN cargo +"$(cat /tmp/rust-toolchain)" build -p neard --release --features nightly_protocol --features nightly_protocol_features && \
mkdir /tmp/build && \
cd /tmp/target/release && \
mv ./neard /tmp/build
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ docker-nearcore:
docker-nearcore-nightly:
DOCKER_BUILDKIT=1 docker build -t nearcore-nightly -f Dockerfile.nightly .

RUST_OPTIONS:=+stable
RUST_OPTIONS:=$(cat rust-toolchain)

export RUSTFLAGS = -D warnings

Expand Down

0 comments on commit 40310e2

Please sign in to comment.