File tree Expand file tree Collapse file tree 3 files changed +12
-15
lines changed
Expand file tree Collapse file tree 3 files changed +12
-15
lines changed Original file line number Diff line number Diff line change 9898
9999# Install rust.
100100ARG RUST_VERSION
101- RUN <<EOF
102- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
103- EOF
101+ ENV CARGO_HOME="/opt/rust/.cargo"
102+ ENV RUSTUP_HOME="/opt/rust/.rustup"
103+ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
104+ ENV PATH="$CARGO_HOME/bin:$PATH"
104105
105106# Print versions.
106107RUN <<EOF
@@ -112,8 +113,6 @@ gcovr --version
112113ld.gold --version
113114mold --version
114115python3 --version
115- . ~/.bashrc
116- . ~/.cargo/env
117116rustc --version
118117cargo --version
119118EOF
Original file line number Diff line number Diff line change 112112
113113# Install rust.
114114ARG RUST_VERSION
115- RUN <<EOF
116- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
117- EOF
115+ ENV CARGO_HOME="/opt/rust/.cargo"
116+ ENV RUSTUP_HOME="/opt/rust/.rustup"
117+ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
118+ ENV PATH="$CARGO_HOME/bin:$PATH"
118119
119120# Print versions.
120121RUN <<EOF
@@ -126,8 +127,6 @@ gcovr --version
126127ld.gold --version
127128mold --version
128129python3 --version
129- . ~/.bashrc
130- . ~/.cargo/env
131130rustc --version
132131cargo --version
133132EOF
Original file line number Diff line number Diff line change 8484
8585# Install rust.
8686ARG RUST_VERSION
87- RUN <<EOF
88- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
89- EOF
87+ ENV CARGO_HOME="/opt/rust/.cargo"
88+ ENV RUSTUP_HOME="/opt/rust/.rustup"
89+ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
90+ ENV PATH="$CARGO_HOME/bin:$PATH"
9091
9192# Print versions.
9293RUN <<EOF
@@ -98,8 +99,6 @@ gcovr --version
9899ld.gold --version
99100mold --version
100101python3 --version
101- . ~/.bashrc
102- . ~/.cargo/env
103102rustc --version
104103cargo --version
105104EOF
You can’t perform that action at this time.
0 commit comments