Skip to content

Commit

Permalink
chore(config): update Copier commit version to v0.29.9-17-g4c45b97
Browse files Browse the repository at this point in the history
  • Loading branch information
entelecheia committed Apr 10, 2024
1 parent f68dd39 commit de2ebe6
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 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.29.9-2-g18f042d
_commit: v0.29.9-17-g4c45b97
_src_path: .
app_dirname: entelecheia
app_install_root: /opt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN if id -u $USERNAME >/dev/null 2>&1; then \
# Fixes sudo error related to core dumps
RUN echo "Set disable_coredump false" > /etc/sudo.conf

# install dotfiles
# Install dotfiles
USER $USERNAME

ARG ARG_USER_FULLNAME="Dev User"
Expand Down
1 change: 1 addition & 0 deletions .docker/.docker-scripts/docker-compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ fi
set +a

# prepare docker network
CONTAINER_NETWORK_NAME=${CONTAINER_NETWORK_NAME:-""}
if [[ -n "${CONTAINER_NETWORK_NAME}" ]] && ! docker network ls | grep -q "${CONTAINER_NETWORK_NAME}"; then
echo "Creating network ${CONTAINER_NETWORK_NAME}"
docker network create "${CONTAINER_NETWORK_NAME}"
Expand Down
1 change: 0 additions & 1 deletion .docker/docker.common.env
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ HOST_HF_HOME=${HOST_HF_HOME:-"$HOST_CACHE_DIR/huggingface"}
# Please do not make any changes below this line if you don't know what you are doing #
# change the variables above to your need #
#######################################################################################
DOCKER_VERBOSE=${DOCKER_VERBOSE:-"true"} # Whether to run the Docker container in verbose mode
# docker build: Configuration parameters for building the Docker image
DOCKER_PROJECT_NAME=${APP_NAME:-"hyperfast-docker"} # The base name of the Docker image.
DOCKER_PROJECT_ID=${DOCKER_PROJECT_ID:-"default"} # The project ID associated with the Docker image to support multiple projects
Expand Down
13 changes: 8 additions & 5 deletions .docker/scripts/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,23 @@ fi
# Ensures files created in the container are owned by you:
# docker run --rm -it -v /some/path:/invokeai -e USER_UID=$(id -u) <this image>
# Default UID: 1000 chosen due to popularity on Linux systems. Possibly 501 on MacOS.
USER_UID=${USER_UID:-1000}
USERNAME=${USERNAME:-app}
USER_UID=${USER_UID:-"1000"}
USERNAME=${USERNAME:-"app"}
LOCAL_UID=$(id -u "$USERNAME")
WORKSPACE_ROOT=${WORKSPACE_ROOT:-""}
APP_INSTALL_ROOT=${APP_INSTALL_ROOT:-""}

if [ "$USER_UID" != "$LOCAL_UID" ]; then
echo "Updating UID and GID to $USER_UID:$USER_UID from $LOCAL_UID:$LOCAL_UID"
usermod -u "$USER_UID" "$USERNAME"
groupmod -g "$USER_UID" "$USERNAME"
echo "Changing ownership of home directory to $USER_UID:$USER_UID"
chown -R "$USER_UID:$USER_UID" "/home/$USERNAME"
echo "Changing ownership of opt directory to $USER_UID:$USER_UID"
chown -R "$USER_UID:$USER_UID" "/opt"
if [ -n "$WORKSPACE_ROOT" ]; then
if [ -n "$APP_INSTALL_ROOT" ] && [ -d "$APP_INSTALL_ROOT" ]; then
echo "Changing ownership of $APP_INSTALL_ROOT directory to $USER_UID:$USER_UID"
chown -R "$USER_UID:$USER_UID" "$APP_INSTALL_ROOT"
fi
if [ -n "$WORKSPACE_ROOT" ] && [ -d "$WORKSPACE_ROOT" ]; then
echo "Changing ownership of workspace directory [$WORKSPACE_ROOT] to $USER_UID:$USER_UID"
chown -R "$USER_UID:$USER_UID" "$WORKSPACE_ROOT"
fi
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy-base-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ jobs:
context: .
file: ./.docker/Dockerfile.base
build-args: |
ARG_BUILD_FROM=${{ env.BUILD_FROM }}
ARG_USERNAME=${{ env.CONTAINER_USERNAME }}
ARG_USER_UID=${{ env.CONTAINER_USER_UID }}
ARG_USER_GID=${{ env.CONTAINER_USER_GID }}
Expand Down

0 comments on commit de2ebe6

Please sign in to comment.