From 8b9b16aa2ed0468af3aee43ae772754b6aaf3b56 Mon Sep 17 00:00:00 2001
From: Paul Campbell <campbjpa@amazon.com>
Date: Tue, 17 Sep 2024 10:39:41 +0100
Subject: [PATCH] fix: make rustfmt and clippy available to all toolchains

---
 Dockerfile    | 3 +--
 entrypoint.sh | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0803b86..11148b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,7 @@ RUN curl -L https://github.com/cargo-bins/cargo-binstall/releases/download/v1.9.
 RUN cargo binstall -y \
   cargo-chef@0.1.67 \
   cargo-hack@0.6.31 \
-  release-plz@0.3.80 && \
-  rustup component add rustfmt clippy
+  release-plz@0.3.80
 
 COPY entrypoint.sh /
 
diff --git a/entrypoint.sh b/entrypoint.sh
index de787ef..3304c78 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -27,6 +27,7 @@ fi
 echo "Selected toolchain: ${TOOLCHAIN}"
 
 rustup update "${TOOLCHAIN}"
+rustup component add rustfmt clippy
 
 if test "${ARGS[0]}" == "cargo";then
   PRE_COMMAND="cargo +${TOOLCHAIN} "