From 3c860d6eaa87bf5e4c05e9dccdf2412a49e10333 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Thu, 2 Feb 2023 19:53:48 +0100
Subject: [PATCH] Update versions (#320)

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/226d840e84c5f306350b0681945989b86760e616
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/80c5322cccc6f9c6f77aaea80b4bb95e25bc05ba


Remove `accelerate` for startup. Refs #317

Use `SIGINT` Fixes #319
---
 docker-compose.yml                |  5 +++--
 services/AUTOMATIC1111/Dockerfile |  8 ++++----
 services/invoke/Dockerfile        | 11 ++++-------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d9c5320..3e8525e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ x-base_service: &base_service
     volumes:
       - &v1 ./data:/data
       - &v2 ./output:/output
+    stop_signal: SIGINT
     deploy:
       resources:
         reservations:
@@ -27,7 +28,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:41
+    image: sd-auto:42
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
 
@@ -42,7 +43,7 @@ services:
     <<: *base_service
     profiles: ["invoke"]
     build: ./services/invoke/
-    image: sd-invoke:21
+    image: sd-invoke:22
     environment:
       - PRELOAD=true
       - CLI_ARGS=
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index 0b283f9..9c255de 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -59,7 +59,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
   pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install opencv-python-headless pyngrok accelerate \
+  pip install pyngrok \
   git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
   git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
   git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b
@@ -67,7 +67,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 # Note: don't update the sha of previous versions because the install will take forever
 # instead, update the repo state in a later step
 
-ARG SHA=00dab8f10defbbda579a1bc89c8d4e972c58a20d
+ARG SHA=226d840e84c5f306350b0681945989b86760e616
 RUN --mount=type=cache,target=/root/.cache/pip <<EOF
 cd stable-diffusion-webui
 git fetch
@@ -87,7 +87,7 @@ sed -i 's/in_app_dir = .*/in_app_dir = True/g' /usr/local/lib/python3.10/site-pa
 EOF
 
 WORKDIR ${ROOT}
-ENV CLI_ARGS="" PYTHONUNBUFFERED=1
+ENV CLI_ARGS=""
 EXPOSE 7860
 ENTRYPOINT ["/docker/entrypoint.sh"]
-CMD accelerate launch --num_cpu_threads_per_process=`nproc` webui.py --listen --port 7860 ${CLI_ARGS}
+CMD python -u webui.py --listen --port 7860 ${CLI_ARGS}
diff --git a/services/invoke/Dockerfile b/services/invoke/Dockerfile
index e158abc..92277e4 100644
--- a/services/invoke/Dockerfile
+++ b/services/invoke/Dockerfile
@@ -41,12 +41,7 @@ ln -sf opencv4.pc opencv.pc
 EOF
 
 
-RUN --mount=type=cache,target=/root/.cache/pip  \
-  --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.15-cp310-cp310-linux_x86_64.whl \
-  pip install triton /xformers-0.0.15-cp310-cp310-linux_x86_64.whl
-
-
-ARG BRANCH=main SHA=07e03b31b7610a27d709b366a491e57085d9b393
+ARG BRANCH=main SHA=80c5322cccc6f9c6f77aaea80b4bb95e25bc05ba
 RUN --mount=type=cache,target=/root/.cache/pip <<EOF
 git fetch
 git reset --hard
@@ -57,8 +52,10 @@ pip install -r req.txt
 rm req.txt
 EOF
 
+
 RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install -U --force-reinstall opencv-python-headless huggingface_hub && \
+  --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.15-cp310-cp310-linux_x86_64.whl \
+  pip install -U opencv-python-headless huggingface_hub triton /xformers-0.0.15-cp310-cp310-linux_x86_64.whl && \
   python3 -c "from patchmatch import patch_match"