From 73cd69075e65f7dccc71bd3c225daf1fa74d7f86 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Sat, 5 Nov 2022 09:51:30 +0100
Subject: [PATCH] Update versions (#198)

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/30b1bcc64e67ad50c5d3af3a6fe1bd1e9553f34e
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/6f6d7571ea56809c1beaf11430ec36ab28e0884f
---
 docker-compose.yml                   | 4 ++--
 services/AUTOMATIC1111/Dockerfile    | 2 +-
 services/AUTOMATIC1111/entrypoint.sh | 1 +
 services/download/download.sh        | 3 ++-
 services/hlky/Dockerfile             | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e3a2134..0a333e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:11
+    image: sd-auto:12
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers
 
@@ -42,7 +42,7 @@ services:
     <<: *base_service
     profiles: ["hlky"]
     build: ./services/hlky/
-    image: sd-hlky:6
+    image: sd-hlky:7
     environment:
       - CLI_ARGS=--optimized-turbo
       - USE_STREAMLIT=0
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index 793070a..8e0a45c 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -65,7 +65,7 @@ RUN [[ "${DEEPDANBOORU:-0}" == "0" ]] && : || pip install tensorflow-cpu==2.10 t
 # 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=cd5eafaf03a25d2b0e35154666947b9489078af9
+ARG SHA=30b1bcc64e67ad50c5d3af3a6fe1bd1e9553f34e
 RUN <<EOF
 cd stable-diffusion-webui
 git fetch
diff --git a/services/AUTOMATIC1111/entrypoint.sh b/services/AUTOMATIC1111/entrypoint.sh
index e7e2f13..c3e2594 100755
--- a/services/AUTOMATIC1111/entrypoint.sh
+++ b/services/AUTOMATIC1111/entrypoint.sh
@@ -20,6 +20,7 @@ MOUNTS["/root/.cache"]="/data/.cache"
 
 # main
 MOUNTS["${ROOT}/models/Stable-diffusion"]="/data/StableDiffusion"
+MOUNTS["${ROOT}/models/VAE"]="/data/VAE"
 MOUNTS["${ROOT}/models/Codeformer"]="/data/Codeformer"
 MOUNTS["${ROOT}/models/GFPGAN"]="/data/GFPGAN"
 MOUNTS["${ROOT}/models/ESRGAN"]="/data/ESRGAN"
diff --git a/services/download/download.sh b/services/download/download.sh
index 4b609ec..5c8b2b1 100755
--- a/services/download/download.sh
+++ b/services/download/download.sh
@@ -2,7 +2,8 @@
 
 set -Eeuo pipefail
 
-mkdir -p /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings
+# TODO: maybe just use the .gitignore file to create all of these
+mkdir -vp /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings /data/VAE /data/Deepdanbooru
 
 echo "Downloading, this might take a while..."
 
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 75d1b40..7a18a0a 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=62f9706d6abf52c7a0facbfddbc22f98e2b3fa85
+ARG BRANCH=dev SHA=6f6d7571ea56809c1beaf11430ec36ab28e0884f
 RUN <<EOF
 cd stable-diffusion
 git fetch