build: Use default rustup profile

Signed-off-by: Jonathan Woollett-Light <jcawl@amazon.co.uk>
pb8o · Jan 10, 2023 · 157b739 · 157b739
1 parent cbc0738
commit 157b739
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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