From 918df65f7bc9448255c9a539ad0b80771d39512e Mon Sep 17 00:00:00 2001 From: Anton Baliasnikov Date: Tue, 5 Mar 2024 09:19:32 +0000 Subject: [PATCH] fix: make rust installation universal for all users (#68) `RUSTUP_HOME` must be defined before installing Rust, fix wrong simplification from previous patch. --- images/llvm_runner/ubuntu22-llvm15.Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/images/llvm_runner/ubuntu22-llvm15.Dockerfile b/images/llvm_runner/ubuntu22-llvm15.Dockerfile index e361350..8369550 100644 --- a/images/llvm_runner/ubuntu22-llvm15.Dockerfile +++ b/images/llvm_runner/ubuntu22-llvm15.Dockerfile @@ -57,13 +57,14 @@ RUN update-alternatives --install \ update-alternatives --config gcc # Install Rust -RUN curl https://sh.rustup.rs -sSf | bash -s -- -y - -# Set required environment variables ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ CARGO_NET_GIT_FETCH_WITH_CLI=true \ - PATH=/usr/lib/llvm-15/bin:/usr/local/cargo/bin:${PATH} \ + PATH=/usr/local/cargo/bin:$PATH +RUN curl https://sh.rustup.rs -sSf | bash -s -- -y + +# Set required environment variables +ENV PATH=/usr/lib/llvm-15/bin:${PATH} \ LD_LIBRARY_PATH=/usr/lib/llvm-15/lib:${LD_LIBRARY_PATH} \ LLVM_VERSION=15 \ CI_RUNNING=true