From e1e03229fdc20051ef2e26b231148d0cee748f72 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Tue, 4 Oct 2022 19:56:38 +0200
Subject: [PATCH] Update versions (#116)

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/1eb588cbf19924333b88beaa1ac0041904966640
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/1e7bdfe3f38a6dd37fc230f440ea1b0db0937240
---
 data/.gitignore                   | 3 ++-
 services/AUTOMATIC1111/Dockerfile | 9 ++++++---
 services/AUTOMATIC1111/mount.sh   | 4 +++-
 services/download/download.sh     | 2 +-
 services/hlky/Dockerfile          | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/data/.gitignore b/data/.gitignore
index d8caa8b..c506004 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -9,5 +9,6 @@
 /BSRGAN
 /RealESRGAN
 /SwinIR
+/ScuNET
 /LDSR
-# TODO: add the embeddings folder here
+/embeddings
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index f6a70a7..ef58e3d 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update && apt install fonts-dejavu-core rsync -y && apt-get clean
 RUN <<EOF
 git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
 cd stable-diffusion-webui
-git reset --hard 15f333a266c20319e2b95a47a8834adf7b914aec
+git reset --hard 1eb588cbf19924333b88beaa1ac0041904966640
 pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
 EOF
 
@@ -49,7 +49,7 @@ RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeForme
 # 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=3f417566b0bda8eab05d247567aebf001c1d1725
+ARG SHA=1eb588cbf19924333b88beaa1ac0041904966640
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
@@ -58,7 +58,10 @@ pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
 pip install --prefer-binary --no-cache-dir -r requirements.txt
 EOF
 
-RUN pip install --prefer-binary -U --no-cache-dir opencv-python-headless
+RUN pip install --prefer-binary --no-cache-dir opencv-python-headless \
+  git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
+  git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1
+
 
 
 COPY . /docker
diff --git a/services/AUTOMATIC1111/mount.sh b/services/AUTOMATIC1111/mount.sh
index 2108f50..a1c7b97 100755
--- a/services/AUTOMATIC1111/mount.sh
+++ b/services/AUTOMATIC1111/mount.sh
@@ -14,6 +14,7 @@ MOUNTS["${ROOT}/models/ESRGAN"]="/data/ESRGAN"
 MOUNTS["${ROOT}/models/BSRGAN"]="/data/BSRGAN"
 MOUNTS["${ROOT}/models/RealESRGAN"]="/data/RealESRGAN"
 MOUNTS["${ROOT}/models/SwinIR"]="/data/SwinIR"
+MOUNTS["${ROOT}/models/ScuNET"]="/data/ScuNET"
 MOUNTS["${ROOT}/models/LDSR"]="/data/LDSR"
 
 MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
@@ -25,7 +26,8 @@ for to_path in "${!MOUNTS[@]}"; do
   set -Eeuo pipefail
   from_path="${MOUNTS[${to_path}]}"
   rm -rf "${to_path}"
-  mkdir -p "$(dirname "${to_path}")"
+  mkdir -vp "$from_path"
+  mkdir -vp "$(dirname "${to_path}")"
   ln -sT "${from_path}" "${to_path}"
   echo Mounted $(basename "${from_path}")
 done
diff --git a/services/download/download.sh b/services/download/download.sh
index 18806a4..952e7d0 100755
--- a/services/download/download.sh
+++ b/services/download/download.sh
@@ -2,7 +2,7 @@
 
 set -Eeuo pipefail
 
-mkdir -p /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR
+mkdir -p /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings
 
 cat <<EOF
 By using this software, you agree to the following licenses:
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 7fd12d5..4d7eee9 100644
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -25,7 +25,7 @@ EOF
 # 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 BRANCH=master  SHA=d0bb60a139d60e6c2b9be4e18e0e29a86aa5af59
-ARG BRANCH=dev SHA=aaa3be16e0e66f07c63dbdb49b9b7cac8fef5cfb
+ARG BRANCH=dev SHA=1e7bdfe3f38a6dd37fc230f440ea1b0db0937240
 RUN <<EOF
 cd stable-diffusion
 git fetch