ci: install rust toolchain for circleci user

DataDog · Apr 15, 2024 · 829cbd4 · 829cbd4
1 parent 292db08
commit 829cbd4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/dockerfiles/ci/bookworm/Dockerfile b/dockerfiles/ci/bookworm/Dockerfile
@@ -239,7 +239,8 @@ RUN mkdir -p -v "${CARGO_HOME}" "${RUSTUP_HOME}" \
     && rustup install nightly${RUST_NIGHTLY_VERSION} \
     && rustup component add rust-src --toolchain nightly${RUST_NIGHTLY_VERSION}-$MARCH-unknown-linux-gnu
 
-ENV PATH="/rust/cargo/bin:${PATH}"
+# Install Rust toolchains for CircleCI user too
+RUN echo ". ${CARGO_HOME?}/env" >> /home/circleci/.bashrc
 
 # Add the wait script to the image: note SHA 672a28f0509433e3b4b9bcd4d9cd7668cea7e31a has been reviewed and should not
 # be changed without an appropriate code review.

diff --git a/dockerfiles/ci/buster/Dockerfile b/dockerfiles/ci/buster/Dockerfile
@@ -281,7 +281,8 @@ RUN mkdir -p -v "${CARGO_HOME}" "${RUSTUP_HOME}" \
     && rm -fr "rustup-init" \
     && rm -rfv /tmp/*
 
-ENV PATH="/rust/cargo/bin:${PATH}"
+# Install Rust toolchains for CircleCI user too
+RUN echo ". ${CARGO_HOME?}/env" >> /home/circleci/.bashrc
 
 ARG GO_VERSION="1.22.1"
 ARG GO_SHA256_ARM="e56685a245b6a0c592fc4a55f0b7803af5b3f827aaa29feab1f40e491acf35b8"