Skip to content

Commit 14de9a4

Browse files
authored
Docker: fix rust set up (#371)
Signed-off-by: Florian Lehner <florian.lehner@elastic.co>
1 parent 57f85fa commit 14de9a4

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

Dockerfile

+14-4
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,23 @@ RUN
4343
# Append to /etc/profile for login shells
4444
RUN echo 'export PATH="/usr/local/go/bin:$PATH"' >> /etc/profile
4545

46-
# Create .cargo directory
47-
RUN mkdir -p /root/.cargo
46+
# Create rust related directories in /usr/local
47+
RUN mkdir -p /usr/local/cargo
48+
RUN mkdir -p /usr/local/rustup
49+
50+
# Set environment variable before rustup installation
51+
ENV CARGO_HOME=/usr/local/cargo
52+
ENV RUSTUP_HOME=/usr/local/rustup
4853

4954
# Install rustup and cargo
5055
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain 1.77
5156

52-
# Add cargo to PATH
53-
RUN echo 'export PATH="/root/.cargo/bin:$PATH"' >> /etc/profile
57+
# Add rust related environment variables
58+
RUN echo 'export PATH="/usr/local/cargo/bin:$PATH"' >> /etc/profile
59+
RUN echo 'export CARGO_HOME="/usr/local/cargo"' >> /etc/profile
60+
RUN echo 'export RUSTUP_HOME="/usr/local/rustup"' >> /etc/profile
61+
62+
# Set mode bits for rustup
63+
RUN chmod -R a+w /usr/local/rustup
5464

5565
ENTRYPOINT ["/bin/bash", "-l", "-c"]

0 commit comments

Comments
 (0)