Skip to content

Commit

Permalink
chore(docker-config): update commit version in copier-docker-config.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
entelecheia committed Oct 9, 2023
1 parent 0650a22 commit 33459c2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .copier-docker-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion .docker/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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)"

Expand Down
2 changes: 1 addition & 1 deletion tmp/.copier-docker-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions tmp/.docker/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit 33459c2

Please sign in to comment.