Skip to content

Commit 157b739

Browse files
Jonathan Woollett-LightJonathanWoollett-Light
Jonathan Woollett-Light
authored andcommitted
build: Use default rustup profile
Signed-off-by: Jonathan Woollett-Light <[email protected]>
1 parent cbc0738 commit 157b739

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

tools/devctr/Dockerfile.aarch64

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ RUN cd "$TMP_POETRY_DIR" \
104104
&& poetry install --no-dev --no-interaction
105105

106106
# Install the Rust toolchain
107-
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain "$RUST_TOOLCHAIN" \
107+
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN" \
108108
&& rustup target add aarch64-unknown-linux-musl \
109-
&& rustup component add clippy llvm-tools-preview \
109+
&& rustup component add llvm-tools-preview \
110110
&& cargo install --version $GRCOV_VERSION grcov
111111

112112
RUN ln -s /usr/bin/musl-gcc /usr/bin/aarch64-linux-musl-gcc

tools/devctr/Dockerfile.x86_64

+2-3
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,9 @@ RUN (curl -sL https://deb.nodesource.com/setup_14.x | bash) \
109109
&& rm -rf /var/lib/apt/lists/*
110110

111111
# Install the Rust toolchain
112-
RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain "$RUST_TOOLCHAIN" \
112+
RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN" \
113113
&& rustup target add x86_64-unknown-linux-musl \
114-
&& rustup component add rustfmt clippy clippy-preview llvm-tools-preview \
115-
&& rustup install --profile minimal "stable" \
114+
&& rustup component add llvm-tools-preview \
116115
&& cargo install +"stable" cargo-audit \
117116
&& cargo install --locked cargo-deny \
118117
&& cargo install --version $GRCOV_VERSION grcov

0 commit comments

Comments
 (0)