diff --git a/.copier-docker-config.yaml b/.copier-docker-config.yaml index c7a326a..b2e892f 100644 --- a/.copier-docker-config.yaml +++ b/.copier-docker-config.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; do NOT edit manually -_commit: v0.23.0-2-g5eefa54 +_commit: v0.23.0-3-g0650a22 _src_path: . app_dirname: entelecheia app_install_root: /workspace/projects diff --git a/.docker/Dockerfile.base b/.docker/Dockerfile.base index 12ea8e4..5ba5f43 100644 --- a/.docker/Dockerfile.base +++ b/.docker/Dockerfile.base @@ -84,6 +84,10 @@ ENV APP_DIRNAME $ARG_APP_DIRNAME ENV APP_SRC_DIR=${APP_INSTALL_ROOT}/${APP_DIRNAME} ENV APP_VIRTUAL_ENV=${APP_INSTALL_ROOT}/.venvs/${APP_DIRNAME} ENV APP_WORKSPACE_ROOT=${APP_INSTALL_ROOT}/workspace +ARG ARG_WORKSPACE_ROOT="/workspace" +ENV WORKSPACE_ROOT $ARG_WORKSPACE_ROOT +# Sets up the workspace for the user +RUN mkdir -p $WORKSPACE_ROOT/projects ENV PATH="$APP_VIRTUAL_ENV/bin:$PATH" @@ -137,7 +141,6 @@ ENV REMOTE_CONTAINERS=1 # ENV DOTFILES_DEBUG=1 USER $USERNAME -RUN sudo rm -rf $WORKSPACE_ROOT && sudo mkdir -p $WORKSPACE_ROOT RUN sudo chown -R $USERNAME:$USERNAME $WORKSPACE_ROOT RUN sh -c "$(wget -qO- https://dotfiles.entelecheia.ai/install)" diff --git a/tmp/.copier-docker-config.yaml b/tmp/.copier-docker-config.yaml index b188d3b..0719640 100644 --- a/tmp/.copier-docker-config.yaml +++ b/tmp/.copier-docker-config.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; do NOT edit manually -_commit: v0.23.0-1-gbab9160 +_commit: v0.23.0-4-g97b7c69 _src_path: . app_dirname: entelecheia app_install_root: /workspace/projects diff --git a/tmp/.docker/Dockerfile.base b/tmp/.docker/Dockerfile.base index c40cc9b..79a054e 100644 --- a/tmp/.docker/Dockerfile.base +++ b/tmp/.docker/Dockerfile.base @@ -40,13 +40,13 @@ ENV APP_DIRNAME $ARG_APP_DIRNAME ENV APP_SRC_DIR=${APP_INSTALL_ROOT}/${APP_DIRNAME} ENV APP_VIRTUAL_ENV=${APP_INSTALL_ROOT}/.venvs/${APP_DIRNAME} ENV APP_WORKSPACE_ROOT=${APP_INSTALL_ROOT}/workspace - - -# Sets the working directory to workspace root ARG ARG_WORKSPACE_ROOT="/workspace" ENV WORKSPACE_ROOT $ARG_WORKSPACE_ROOT # Sets up the workspace for the user -RUN rm -rf $WORKSPACE_ROOT && mkdir -p $WORKSPACE_ROOT/projects +RUN mkdir -p $WORKSPACE_ROOT/projects + + +# Sets the working directory to workspace root WORKDIR $WORKSPACE_ROOT # Copies scripts from host into the image COPY ./.docker/scripts/ ./scripts/