Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions docker/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,10 @@ EOF

# Install rust.
ARG RUST_VERSION
RUN <<EOF
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
EOF
ENV CARGO_HOME="/opt/rust/.cargo"
ENV RUSTUP_HOME="/opt/rust/.rustup"
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
ENV PATH="$CARGO_HOME/bin:$PATH"

# Print versions.
RUN <<EOF
Expand All @@ -112,8 +113,6 @@ gcovr --version
ld.gold --version
mold --version
python3 --version
. ~/.bashrc
. ~/.cargo/env
rustc --version
cargo --version
EOF
Expand Down
9 changes: 4 additions & 5 deletions docker/rhel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,10 @@ EOF

# Install rust.
ARG RUST_VERSION
RUN <<EOF
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
EOF
ENV CARGO_HOME="/opt/rust/.cargo"
ENV RUSTUP_HOME="/opt/rust/.rustup"
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
ENV PATH="$CARGO_HOME/bin:$PATH"

# Print versions.
RUN <<EOF
Expand All @@ -126,8 +127,6 @@ gcovr --version
ld.gold --version
mold --version
python3 --version
. ~/.bashrc
. ~/.cargo/env
rustc --version
cargo --version
EOF
Expand Down
9 changes: 4 additions & 5 deletions docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ EOF

# Install rust.
ARG RUST_VERSION
RUN <<EOF
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
EOF
ENV CARGO_HOME="/opt/rust/.cargo"
ENV RUSTUP_HOME="/opt/rust/.rustup"
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
ENV PATH="$CARGO_HOME/bin:$PATH"

# Print versions.
RUN <<EOF
Expand All @@ -98,8 +99,6 @@ gcovr --version
ld.gold --version
mold --version
python3 --version
. ~/.bashrc
. ~/.cargo/env
rustc --version
cargo --version
EOF
Expand Down