johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

✨ Use different approach for setup cargo home

Browse Source
This commit is contained in:
Andrey Antukh
2025-06-02 22:29:39 +02:00
parent 0ec0917b6d
commit 1909189ce0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/devenv/Dockerfile
View File

@@ -260,10 +260,10 @@ RUN set -ex; \
mv /tmp/mc /usr/local/bin/; \ mv /tmp/mc /usr/local/bin/; \
chmod +x /usr/local/bin/mc; chmod +x /usr/local/bin/mc;
WORKDIR /home WORKDIR /usr/local
# Install Rust toolchain # 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; \ 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 # Same steps as in Rust official Docker image https://github.com/rust-lang/docker-rust/blob/9f287282d513a84cb7c7f38f197838f15d37b6a9/1.81.0/bookworm/Dockerfile

6
docker/devenv/files/entrypoint.sh
View File

@@ -2,7 +2,7 @@
set -e 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; usermod -u ${EXTERNAL_UID:-1000} penpot;
@@ -11,5 +11,9 @@ cp /root/.vimrc /home/penpot/.vimrc
cp /root/.tmux.conf /home/penpot/.tmux.conf cp /root/.tmux.conf /home/penpot/.tmux.conf
chown -R penpot:users /home/penpot 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 "$@" exec "$@"