From eeb410f2de959b3ab07098371cae8074f559d11f Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Fri, 27 Jan 2023 07:55:22 +0100
Subject: [PATCH] Update versions (#315)

auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/7a14c8ab45da8a681792a6331d48a88dd684a0a9
invoke:
https://github.com/invoke-ai/InvokeAI/commit/e4cd66216e0b941de7f27b4e2e260aa4f8c956e7

Also, fix script mounting in auto #295
---
 docker-compose.yml                   | 4 ++--
 services/AUTOMATIC1111/Dockerfile    | 5 ++---
 services/AUTOMATIC1111/entrypoint.sh | 3 ++-
 services/invoke/Dockerfile           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2020ec1..143e58f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:39
+    image: sd-auto:40
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
 
@@ -42,7 +42,7 @@ services:
     <<: *base_service
     profiles: ["invoke"]
     build: ./services/invoke/
-    image: sd-invoke:19
+    image: sd-invoke:20
     environment:
       - PRELOAD=true
       - CLI_ARGS=
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index e7e0fdb..5dc1a17 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -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=93fad28a979727f9b1331dbdc447598824057cdc
+ARG SHA=7a14c8ab45da8a681792a6331d48a88dd684a0a9
 RUN --mount=type=cache,target=/root/.cache/pip <<EOF
 cd stable-diffusion-webui
 git fetch
@@ -75,8 +75,7 @@ git reset --hard ${SHA}
 pip install -r requirements_versions.txt
 EOF
 
-RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install -U opencv-python-headless 'transformers>=4.24'
+RUN --mount=type=cache,target=/root/.cache/pip  pip install -U opencv-python-headless
 
 COPY . /docker
 
diff --git a/services/AUTOMATIC1111/entrypoint.sh b/services/AUTOMATIC1111/entrypoint.sh
index 66244ca..9463baf 100755
--- a/services/AUTOMATIC1111/entrypoint.sh
+++ b/services/AUTOMATIC1111/entrypoint.sh
@@ -5,7 +5,8 @@ set -Eeuo pipefail
 # TODO: move all mkdir -p ?
 mkdir -p /data/config/auto/scripts/
 # mount scripts individually
-cp -vrTs /data/config/auto/scripts/ "${ROOT}/scripts/"
+find "${ROOT}/scripts/" -maxdepth 1 -type l -delete
+cp -vrfTs /data/config/auto/scripts/ "${ROOT}/scripts/"
 
 cp -n /docker/config.json /data/config/auto/config.json
 jq '. * input' /data/config/auto/config.json /docker/config.json | sponge /data/config/auto/config.json
diff --git a/services/invoke/Dockerfile b/services/invoke/Dockerfile
index 8028238..fabacbf 100644
--- a/services/invoke/Dockerfile
+++ b/services/invoke/Dockerfile
@@ -46,7 +46,7 @@ RUN --mount=type=cache,target=/root/.cache/pip  \
   pip install triton /xformers-0.0.15-cp310-cp310-linux_x86_64.whl
 
 
-ARG BRANCH=main SHA=89791d91e84abfc127ffecca21db68920781709f
+ARG BRANCH=main SHA=e4cd66216e0b941de7f27b4e2e260aa4f8c956e7
 RUN --mount=type=cache,target=/root/.cache/pip <<EOF
 git fetch
 git reset --hard
@@ -58,7 +58,7 @@ rm req.txt
 EOF
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install -U --force-reinstall opencv-python-headless huggingface_hub 'transformers>=4.24' && \
+  pip install -U --force-reinstall opencv-python-headless huggingface_hub && \
   python3 -c "from patchmatch import patch_match"