Docker compose changes

.gitignore

@@ -188,3 +188,6 @@ installer/install.sh
 installer/update.bat
 installer/update.sh
 installer/InvokeAI-Installer/
+
+# Docker
+docker/compose.override.yaml

docker/compose.override.yaml.sample

@@ -0,0 +1,9 @@
+services:
+  invokeai-cuda:
+    restart: unless-stopped
+    labels:
+    - traefik.enable=true
+    - traefik.http.routers.invokeai-cuda.rule=Host(`invokeai.example.com`)
+    - traefik.http.routers.invokeai-cuda.entrypoints=websecure
+    - traefik.http.middlewares.invokeai-cuda-ipwhitelist.ipwhitelist.sourcerange=0.0.0.0/0
+    - traefik.http.routers.invokeai-cuda.middlewares=invokeai-cuda-ipwhitelist

docker/docker-compose.yml

@@ -29,10 +29,10 @@ x-invokeai: &invokeai
       - ${HF_HOME:-~/.cache/huggingface}:${HF_HOME:-/invokeai/.cache/huggingface}
     tty: true
     stdin_open: true
-
+    labels: []
 
 services:
-  invokeai-nvidia:
+  invokeai-cuda:
     <<: *invokeai
     deploy:
       resources:

docker/run.sh

@@ -9,7 +9,12 @@ run() {
   local profile=""
 
   touch .env
-  build_args=$(awk '$1 ~ /=[^$]/ && $0 !~ /^#/ {print "--build-arg " $0 " "}' .env) &&
+  while IFS='=' read -r key value; do
+    if [[ ! $key =~ ^# && ! -z $value ]]; then
+      build_args+=" --build-arg $key=$value"
+      export "$key=$value"
+    fi
+  done < .env
   profile="$(awk -F '=' '/GPU_DRIVER/ {print $2}' .env)"
 
   [[ -z "$profile" ]] && profile="nvidia"
@@ -25,7 +30,9 @@ run() {
   unset build_args
 
   printf "%s\n" "starting service $service_name"
-  docker compose --profile "$profile" up -d "$service_name"
+  # `touch compose.override.yaml` in case user doesn't use it (i.e., doesn't have it)
+  touch compose.override.yaml
+  docker compose --profile "$profile" -f docker-compose.yml -f compose.override.yaml up -d "$service_name"
   docker compose logs -f
 }