From 083d12541d8dda5fbb3f950e451b8186d3f31d13 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Wed, 30 Nov 2022 19:33:44 +0100
Subject: [PATCH] Update versions (#246)

- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/18a3b809275c395b9a2730c78d6bc0f9b06671e1
- lstein:
https://github.com/invoke-ai/InvokeAI/commit/a9aa4e45aa6f5d5a2aa385349131d8733dd380fa
---
 docker-compose.yml            | 4 ++--
 services/hlky/Dockerfile      | 2 +-
 services/lstein/Dockerfile    | 7 ++++---
 services/lstein/entrypoint.sh | 5 ++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4984e4038..00705d924 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,7 +42,7 @@ services:
     <<: *base_service
     profiles: ["hlky"]
     build: ./services/hlky/
-    image: sd-hlky:9
+    image: sd-hlky:10
     environment:
       - CLI_ARGS=--optimized-turbo
       - USE_STREAMLIT=0
@@ -51,7 +51,7 @@ services:
     <<: *base_service
     profiles: ["lstein"]
     build: ./services/lstein/
-    image: sd-lstein:7
+    image: sd-lstein:8
     environment:
       - PRELOAD=true
       - CLI_ARGS=--max_loaded_models=1
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 2bfce400a..d53d5d6f6 100644
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -25,7 +25,7 @@ EOF
 
 RUN apt-get update && apt install libsndfile1 ffmpeg -y && apt-get clean
 
-ARG BRANCH=dev SHA=269107a104fc9fee3201eb2c56cf7adb3d063e4b
+ARG BRANCH=dev SHA=18a3b809275c395b9a2730c78d6bc0f9b06671e1
 RUN <<EOF
 cd stable-diffusion
 git fetch
diff --git a/services/lstein/Dockerfile b/services/lstein/Dockerfile
index a988a6167..c4bd6964d 100644
--- a/services/lstein/Dockerfile
+++ b/services/lstein/Dockerfile
@@ -23,7 +23,7 @@ pip install -r requirements.txt
 EOF
 
 
-ARG BRANCH=development SHA=2b7e3abe57963d199f1d825ddef87ae154c81045
+ARG BRANCH=development SHA=a9aa4e45aa6f5d5a2aa385349131d8733dd380fa
 RUN <<EOF
 git fetch
 git reset --hard
@@ -32,11 +32,12 @@ git reset --hard ${SHA}
 pip install -r requirements.txt
 EOF
 
-RUN pip uninstall opencv-python -y && pip install --force-reinstall opencv-python-headless==4.5.5.64
+RUN pip install --force-reinstall opencv-python-headless==4.5.5.64
 
 COPY . /docker/
 RUN <<EOF
 python3 /docker/info.py /stable-diffusion/frontend/dist/index.html
+touch ~/.invokeai
 EOF
 
 
@@ -45,4 +46,4 @@ EXPOSE 7860
 
 
 ENTRYPOINT ["/docker/entrypoint.sh"]
-CMD python3 -u scripts/invoke.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
+CMD python3 -u scripts/invoke.py --web --host 0.0.0.0 --port 7860 --config /docker/models.yaml --root_dir . --outdir /output ${CLI_ARGS}
diff --git a/services/lstein/entrypoint.sh b/services/lstein/entrypoint.sh
index 7a5e5229a..3faeaf188 100755
--- a/services/lstein/entrypoint.sh
+++ b/services/lstein/entrypoint.sh
@@ -19,12 +19,11 @@ MOUNTS["${ROOT}/models/bert-base-uncased"]=/data/.cache/huggingface/transformers
 MOUNTS["${ROOT}/models/openai/clip-vit-large-patch14"]=/data/.cache/huggingface/transformers
 MOUNTS["${ROOT}/models/CompVis/stable-diffusion-safety-checker"]=/data/.cache/huggingface/transformers
 
-MOUNTS["${ROOT}/configs/models.yaml"]=/docker/models.yaml
+
 # hacks
 MOUNTS["/opt/conda/lib/python3.10/site-packages/facexlib/weights"]=/data/.cache/
 MOUNTS["${ROOT}/models/clipseg"]=/data/.cache/invoke/clipseg/
 
-# MOUNTS["/opt/conda/lib/python3.9/site-packages/realesrgan/weights"]=/data/RealESRGAN
 
 for to_path in "${!MOUNTS[@]}"; do
   set -Eeuo pipefail
@@ -41,7 +40,7 @@ for to_path in "${!MOUNTS[@]}"; do
 done
 
 if "${PRELOAD}" == "true"; then
-  python3 -u scripts/preload_models.py --no-interactive
+  python3 -u scripts/preload_models.py --no-interactive --root . --config_file /docker/models.yaml
 fi
 
 exec "$@"