From 78c90e543599b04ba51d38fc9696775a63f4a0f7 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Sun, 1 Jan 2023 16:46:41 +0100
Subject: [PATCH] Update auto & invoke (#277)

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/524d532b387732d4d32f237e792c7f201a934400
- invoke:
https://github.com/invoke-ai/InvokeAI/commit/524d532b387732d4d32f237e792c7f201a934400

Happy new Year!!!
---
 docker-compose.yml                |  4 ++--
 services/AUTOMATIC1111/Dockerfile |  2 +-
 services/invoke/Dockerfile        | 10 ++++------
 services/invoke/entrypoint.sh     |  1 -
 services/invoke/info.py           | 13 -------------
 5 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 services/invoke/info.py

diff --git a/docker-compose.yml b/docker-compose.yml
index 3ba8be1..5a1a5f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:25
+    image: sd-auto:26
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
 
@@ -58,7 +58,7 @@ services:
     <<: *base_service
     profiles: ["invoke"]
     build: ./services/invoke/
-    image: sd-invoke:14
+    image: sd-invoke:15
     environment:
       - PRELOAD=true
       - CLI_ARGS=
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index be45023..8cb6791 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -68,7 +68,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=4af3ca5393151d61363c30eef4965e694eeac15e
+ARG SHA=524d532b387732d4d32f237e792c7f201a934400
 RUN --mount=type=cache,target=/root/.cache/pip <<EOF
 cd stable-diffusion-webui
 git fetch
diff --git a/services/invoke/Dockerfile b/services/invoke/Dockerfile
index bbed96d..9059f4c 100644
--- a/services/invoke/Dockerfile
+++ b/services/invoke/Dockerfile
@@ -33,7 +33,7 @@ cd /usr/lib/x86_64-linux-gnu/pkgconfig/
 ln -sf opencv4.pc opencv.pc
 EOF
 
-ARG BRANCH=main SHA=ffa54f4a35ed1aa5a574f911de9dab777cf01f3e
+ARG BRANCH=main SHA=caf7caddf7230b36f793af52c2bc97332c025a07
 RUN --mount=type=cache,target=/root/.cache/pip <<EOF
 git fetch
 git reset --hard
@@ -43,14 +43,12 @@ pip install -r binary_installer/py3.10-linux-x86_64-cuda-reqs.txt
 EOF
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install --force-reinstall opencv-python-headless && python3 -c "from patchmatch import patch_match"
+  pip install -U --force-reinstall opencv-python-headless huggingface_hub && \
+  python3 -c "from patchmatch import patch_match"
 
 
+RUN touch invokeai.init
 COPY . /docker/
-RUN <<EOF
-python3 /docker/info.py /stable-diffusion/frontend/dist/index.html
-touch invokeai.init
-EOF
 
 
 ENV ROOT=/stable-diffusion PYTHONPATH="${PYTHONPATH}:${ROOT}" PRELOAD=false CLI_ARGS=""
diff --git a/services/invoke/entrypoint.sh b/services/invoke/entrypoint.sh
index 577d93f..d43ebf5 100755
--- a/services/invoke/entrypoint.sh
+++ b/services/invoke/entrypoint.sh
@@ -19,7 +19,6 @@ 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}/embeddings"]=/data/embeddings/
 
 # hacks
diff --git a/services/invoke/info.py b/services/invoke/info.py
deleted file mode 100644
index 4b8ece8..0000000
--- a/services/invoke/info.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import sys
-from pathlib import Path
-
-file = Path(sys.argv[1])
-file.write_text(
-  file.read_text()\
-  .replace('  <div id="root"></div>', """
-    <div id="root"></div>
-    <div>
-      Deployed with <a href="https://github.com/AbdBarho/stable-diffusion-webui-docker/">stable-diffusion-webui-docker</a>
-    </div>
-""", 1)
-)