Pass env vars as build-args, ensure node modules isn't getting passed in

.dockerignore

@@ -3,3 +3,5 @@
 !pyproject.toml
 !docker/docker-entrypoint.sh
 !LICENSE
+
+node_modules

docker/Dockerfile

@@ -21,7 +21,7 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 ARG TORCH_VERSION=2.0.1
 ARG TORCHVISION_VERSION=0.15.2
 ARG GPU_DRIVER=cuda
-ARG TARGETPLATFORM
+ARG TARGETPLATFORM="linux/amd64"
 # unused but available
 ARG BUILDPLATFORM
 

docker/build.sh

@@ -1,4 +1,11 @@
 #!/usr/bin/env bash
 set -e
 
-docker-compose build
+build_args=""
+
+[[ -f ".env" ]] && build_args=$(awk '$1 ~ /\=/ {print "--build-arg " $0 " "}' .env)
+
+echo "docker-compose build args:"
+echo $build_args
+
+docker-compose build $build_args

docker/docker-compose.yml

@@ -34,6 +34,8 @@ services:
     volumes:
       - ${INVOKEAI_ROOT:-~/invokeai}:${INVOKEAI_ROOT:-/invokeai}
       - ${HF_HOME:-~/.cache/huggingface}:${HF_HOME:-/invokeai/.cache/huggingface}
+      # - ${INVOKEAI_MODELS_DIR:-${INVOKEAI_ROOT:-/invokeai/models}}
+      # - ${INVOKEAI_MODELS_CONFIG_PATH:-${INVOKEAI_ROOT:-/invokeai/configs/models.yaml}}
     tty: true
     stdin_open: true