diff --git a/Dockerfile b/Dockerfile index 3366ae3c..850642e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,7 +64,9 @@ ARG USER_ID="1000" # drawback still pays off as running this image as root is a corner case. ENV USER="${USER}" ENV HOME="/home/${USER}" -ENV PATH="${HOME}/.local/bin:${HOME}/.volta/bin:${PATH}" +ENV VOLTA_HOME="/opt/volta" +ENV PKGX_DIR="/opt/pkgx" +ENV PATH="${VOLTA_HOME}/bin:${HOME}/.local/bin:${PATH}" RUN --mount=type=bind,source=devcontainer/scripts/prepare_user.sh,target=/prepare_user.sh \ /prepare_user.sh diff --git a/devcontainer/scripts/prepare_user.sh b/devcontainer/scripts/prepare_user.sh index 8f1d0a4e..283648e7 100755 --- a/devcontainer/scripts/prepare_user.sh +++ b/devcontainer/scripts/prepare_user.sh @@ -43,7 +43,7 @@ VOLTA_VERSION="1.1.1" sudo -u "${USER}" pkgx install "volta.sh@${VOLTA_VERSION}" # cleanup -sudo -u "${USER}" rm -rf "${HOME}/.pkgx" "${HOME}/.cache/pkgx" "${HOME}/.local/share/pkgx" +sudo -u "${USER}" rm -rf "${PKGX_DIR}" "${HOME}/.cache/pkgx" "${HOME}/.local/share/pkgx" shopt -s nullglob dotglob rm -rf /tmp/* /var/cache/* /var/lib/apt/lists/*