From 1909189ce06c18cdb9f7943bee19b3751bd7388a Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 2 Jun 2025 22:29:39 +0200
Subject: [PATCH] :sparkles: Use different approach for setup cargo home

---
 docker/devenv/Dockerfile          | 4 ++--
 docker/devenv/files/entrypoint.sh | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index a7dea8c993..c36e75894d 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -260,10 +260,10 @@ RUN set -ex; \
     mv /tmp/mc /usr/local/bin/; \
     chmod +x /usr/local/bin/mc;
 
-WORKDIR /home
+WORKDIR /usr/local
 
 # Install Rust toolchain
-ENV PATH=/home/cargo/bin:$PATH RUSTUP_HOME=/home/rustp CARGO_HOME=/home/cargo
+ENV PATH=/usr/local/cargo/bin:$PATH RUSTUP_HOME=/usr/local/rustpo CARGO_HOME=/usr/local/cargo
 
 RUN set -eux; \
     # Same steps as in Rust official Docker image https://github.com/rust-lang/docker-rust/blob/9f287282d513a84cb7c7f38f197838f15d37b6a9/1.81.0/bookworm/Dockerfile
diff --git a/docker/devenv/files/entrypoint.sh b/docker/devenv/files/entrypoint.sh
index 5726fda1e1..ba112dd61d 100755
--- a/docker/devenv/files/entrypoint.sh
+++ b/docker/devenv/files/entrypoint.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-EMSDK_QUIET=1 . /home/emsdk/emsdk_env.sh;
+EMSDK_QUIET=1 . /usr/local/emsdk/emsdk_env.sh;
 
 usermod -u ${EXTERNAL_UID:-1000} penpot;
 
@@ -11,5 +11,9 @@ cp /root/.vimrc /home/penpot/.vimrc
 cp /root/.tmux.conf /home/penpot/.tmux.conf
 
 chown -R penpot:users /home/penpot
+rsync -ar --chown=penpot:users /usr/local/cargo/ /home/penpot/.cargo/
+
+export PATH="/home/penpot/.cargo/bin:$PATH"
+export CARGO_HOME="/home/penpot/.cargo"
 
 exec "$@"