fix(app): change default container username to 'dev'

entelecheia · May 5, 2024 · e354663 · e354663
1 parent ca50e86
commit e354663
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/.copier-docker-config.cuda-12.1.0-ubuntu22.04.yaml b/.copier-docker-config.cuda-12.1.0-ubuntu22.04.yaml
@@ -12,7 +12,7 @@ cuda_device_id: all
 docker_apt_packages: fontconfig fonts-nanum
 docker_build_from: nvcr.io/nvidia/cuda:12.1.0-devel-ubuntu22.04
 docker_container_uid: 9001
-docker_container_username: app
+docker_container_username: dev
 docker_image_variant_name: cuda-12.1.0-ubuntu22.04
 docker_image_version_variable_name: IMAGE_VERSION
 docker_name_prefix: DEVCON

diff --git a/.copier-docker-config.ubuntu-20.04.yaml b/.copier-docker-config.ubuntu-20.04.yaml
@@ -12,7 +12,7 @@ cuda_device_id: all
 docker_apt_packages: fontconfig fonts-nanum
 docker_build_from: library/ubuntu:20.04
 docker_container_uid: 9001
-docker_container_username: app
+docker_container_username: dev
 docker_image_variant_name: ubuntu-20.04
 docker_image_version_variable_name: IMAGE_VERSION
 docker_name_prefix: DEVCON

diff --git a/.copier-docker-config.ubuntu-22.04.yaml b/.copier-docker-config.ubuntu-22.04.yaml
@@ -12,7 +12,7 @@ cuda_device_id: all
 docker_apt_packages: fontconfig fonts-nanum
 docker_build_from: library/ubuntu:22.04
 docker_container_uid: 9001
-docker_container_username: app
+docker_container_username: dev
 docker_image_variant_name: ubuntu-22.04
 docker_image_version_variable_name: IMAGE_VERSION
 docker_name_prefix: DEVCON

diff --git a/.copier-docker-config.yaml b/.copier-docker-config.yaml
@@ -12,7 +12,7 @@ cuda_device_id: all
 docker_apt_packages: fontconfig fonts-nanum
 docker_build_from: library/ubuntu:22.04
 docker_container_uid: 9001
-docker_container_username: app
+docker_container_username: dev
 docker_image_variant_name: ubuntu-22.04
 docker_image_version_variable_name: IMAGE_VERSION
 docker_name_prefix: DEVCON

diff --git a/.docker/Dockerfile.cuda-12.1.0-ubuntu22.04 b/.docker/Dockerfile.cuda-12.1.0-ubuntu22.04
@@ -44,7 +44,7 @@ RUN mkdir -p /var/run/sshd
 RUN service ssh start
 
 # Setting ARGs and ENVs for user creation and workspace setup
-ARG ARG_USERNAME="app"
+ARG ARG_USERNAME="dev"
 ARG ARG_USER_UID=9001
 ARG ARG_USER_GID=$ARG_USER_UID
 ENV USERNAME $ARG_USERNAME

diff --git a/.docker/Dockerfile.ubuntu-20.04 b/.docker/Dockerfile.ubuntu-20.04
@@ -48,7 +48,7 @@ ENV TZ="Asia/Seoul"
 RUN localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || true
 
 # Setting ARGs and ENVs for user creation and workspace setup
-ARG ARG_USERNAME="app"
+ARG ARG_USERNAME="dev"
 ARG ARG_USER_UID=9001
 ARG ARG_USER_GID=$ARG_USER_UID
 ENV USERNAME $ARG_USERNAME

diff --git a/.docker/Dockerfile.ubuntu-22.04 b/.docker/Dockerfile.ubuntu-22.04
@@ -48,7 +48,7 @@ ENV TZ="Asia/Seoul"
 RUN localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || true
 
 # Setting ARGs and ENVs for user creation and workspace setup
-ARG ARG_USERNAME="app"
+ARG ARG_USERNAME="dev"
 ARG ARG_USER_UID=9001
 ARG ARG_USER_GID=$ARG_USER_UID
 ENV USERNAME $ARG_USERNAME

diff --git a/.docker/docker.common.env b/.docker/docker.common.env
@@ -33,7 +33,7 @@ DOCKER_PROJECT_ID=${DOCKER_PROJECT_ID:-"default"}
 DOCKER_USERNAME=${DOCKER_USERNAME:-"entelecheia"}                            # The username for Docker.
 IMAGE_VERSION=${IMAGE_VERSION:-"1.0.0"}                     # The version of the Docker image. If not set, "1.0.0" will be used.
 CONTAINER_REGISTRY=${CONTAINER_REGISTRY:-"ghcr.io"}                      # The Docker registry to push the image to.
-CONTAINER_USERNAME="app"                                   # The username of the user. If not set, the current user's username will be used.
+CONTAINER_USERNAME="dev"                                   # The username of the user. If not set, the current user's username will be used.
 CONTAINER_USER_UID=${USER_UID:-"9001"}                           # The user ID in the Docker container.
 CONTAINER_USER_GID=${USER_GID:-"9001"}                           # The group ID in the Docker container.
 CONTAINER_GITHUB_USERNAME=${GITHUB_USERNAME:-"entelecheia"}                  # The GitHub username of the project

diff --git a/.docker/scripts/entrypoint.sh b/.docker/scripts/entrypoint.sh
@@ -16,7 +16,7 @@ fi
 #   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"}
+USERNAME=${USERNAME:-"dev"}
 LOCAL_UID=$(id -u "$USERNAME")
 WORKSPACE_ROOT=${WORKSPACE_ROOT:-""}
 APP_INSTALL_ROOT=${APP_INSTALL_ROOT:-""}