Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 38a2736

Browse files
committedSep 12, 2024··
Don't put rustfilt in cargo path
1 parent a1be73d commit 38a2736

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed
 

‎docker/build-tools/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,7 @@ ENV RUSTUP_HOME=/home/.rustup
630630
RUN curl --proto '=https' -v --tlsv1.2 -sSf https://sh.rustup.rs | \
631631
sh -s -- -y -v --default-toolchain ${RUST_VERSION} --profile minimal --component rustfmt clippy &&\
632632
/home/.cargo/bin/rustup default ${RUST_VERSION} &&\
633+
/home/.cargo/bin/cargo install rustfilt &&\
633634
mv /home/.cargo/bin/* /usr/bin
634635
RUN cargo install rustfilt
635636

@@ -686,9 +687,6 @@ ENV PATH=/usr/local/go/bin:/gobin:/usr/local/google-cloud-sdk/bin:$PATH
686687
# Ruby support
687688
ENV RUBYOPT="-KU -E utf-8:utf-8"
688689

689-
# Rust support
690-
ENV PATH=/home/.cargo/bin/:$PATH
691-
692690
# Create the file system
693691
COPY --link --from=base_os_context / /
694692
COPY --link --from=binary_tools_context_base /out/ /

0 commit comments

Comments
 (0)
Please sign in to comment.