From 157b739035be9b52ef0c1a4cc571575966feb0de Mon Sep 17 00:00:00 2001 From: Jonathan Woollett-Light Date: Tue, 10 Jan 2023 10:09:58 +0000 Subject: [PATCH] build: Use default rustup profile Signed-off-by: Jonathan Woollett-Light --- tools/devctr/Dockerfile.aarch64 | 4 ++-- tools/devctr/Dockerfile.x86_64 | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/devctr/Dockerfile.aarch64 b/tools/devctr/Dockerfile.aarch64 index bc3fcba5f32..93aca30bb27 100644 --- a/tools/devctr/Dockerfile.aarch64 +++ b/tools/devctr/Dockerfile.aarch64 @@ -104,9 +104,9 @@ RUN cd "$TMP_POETRY_DIR" \ && poetry install --no-dev --no-interaction # Install the Rust toolchain -RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain "$RUST_TOOLCHAIN" \ +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN" \ && rustup target add aarch64-unknown-linux-musl \ - && rustup component add clippy llvm-tools-preview \ + && rustup component add llvm-tools-preview \ && cargo install --version $GRCOV_VERSION grcov RUN ln -s /usr/bin/musl-gcc /usr/bin/aarch64-linux-musl-gcc diff --git a/tools/devctr/Dockerfile.x86_64 b/tools/devctr/Dockerfile.x86_64 index f9fc0d7e5ea..3b37cf37798 100644 --- a/tools/devctr/Dockerfile.x86_64 +++ b/tools/devctr/Dockerfile.x86_64 @@ -109,10 +109,9 @@ RUN (curl -sL https://deb.nodesource.com/setup_14.x | bash) \ && rm -rf /var/lib/apt/lists/* # Install the Rust toolchain -RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain "$RUST_TOOLCHAIN" \ +RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN" \ && rustup target add x86_64-unknown-linux-musl \ - && rustup component add rustfmt clippy clippy-preview llvm-tools-preview \ - && rustup install --profile minimal "stable" \ + && rustup component add llvm-tools-preview \ && cargo install +"stable" cargo-audit \ && cargo install --locked cargo-deny \ && cargo install --version $GRCOV_VERSION grcov