Skip to content

Commit

Permalink
Fix the docker build by updating rust (tgstation#40331)
Browse files Browse the repository at this point in the history
* Fix the docker build by updating rust

* Use absolute cargo path
  • Loading branch information
Cyberboss authored and vuonojenmustaturska committed Sep 19, 2018
1 parent a03e7df commit 9af67e2
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ WORKDIR /rust_g

RUN apt-get install -y --no-install-recommends \
libssl-dev \
rustc \
cargo \
pkg-config \
curl \
gcc-multilib \
&& curl https://sh.rustup.rs -sSf | sh -s -- -y --default-host i686-unknown-linux-gnu \
&& git init \
&& git remote add origin https://github.com/tgstation/rust-g

Expand All @@ -25,7 +26,7 @@ COPY dependencies.sh .
RUN /bin/bash -c "source dependencies.sh \
&& git fetch --depth 1 origin \$RUST_G_VERSION" \
&& git checkout FETCH_HEAD \
&& cargo build --release
&& ~/.cargo/bin/cargo build --release

FROM build_base as bsql

Expand Down

0 comments on commit 9af67e2

Please sign in to comment.