From 9e7979b756bd45ea49acff4ce6ca22cdb3c9415a Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Sun, 20 Nov 2022 11:05:39 +0100
Subject: [PATCH] Update Versions (#230)

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/47a44c7e421b98ca07e92dbf88769b04c9e28f86
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/269107a104fc9fee3201eb2c56cf7adb3d063e4b


Refs #216
---
 docker-compose.yml                      | 4 ++--
 services/AUTOMATIC1111/Dockerfile       | 6 +++---
 services/hlky/Dockerfile                | 2 +-
 services/hlky/userconfig_streamlit.yaml | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index da34f00..af00588 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:16
+    image: sd-auto:17
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers
 
@@ -42,7 +42,7 @@ services:
     <<: *base_service
     profiles: ["hlky"]
     build: ./services/hlky/
-    image: sd-hlky:8
+    image: sd-hlky:9
     environment:
       - CLI_ARGS=--optimized-turbo
       - USE_STREAMLIT=0
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index 5ce8e92..c9fd119 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -70,7 +70,7 @@ RUN pip install opencv-python-headless \
 # 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=98947d173e3f1667eba29c904f681047dea9de90
+ARG SHA=47a44c7e421b98ca07e92dbf88769b04c9e28f86
 RUN <<EOF
 cd stable-diffusion-webui
 git fetch
@@ -88,9 +88,9 @@ mv  ${ROOT}/style.css ${ROOT}/user.css
 sed -i 's/os.rename(tmpdir, target_dir)/shutil.move(tmpdir,target_dir)/' ${ROOT}/modules/ui_extensions.py
 EOF
 
-WORKDIR ${ROOT}/repositories/stable-diffusion
+WORKDIR ${ROOT}
 ENV CLI_ARGS=""
 EXPOSE 7860
 ENTRYPOINT ["/docker/entrypoint.sh"]
 # run, -u to not buffer stdout / stderr
-CMD python3 -u ../../webui.py --listen --port 7860 --ckpt-dir ${ROOT}/models/Stable-diffusion ${CLI_ARGS}
+CMD python3 -u webui.py --listen --port 7860 ${CLI_ARGS}
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 2bdafe1..2bfce40 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=master SHA=09b64d4f759c44c7c6bc4d433ddd8e964d48b854
+ARG BRANCH=dev SHA=269107a104fc9fee3201eb2c56cf7adb3d063e4b
 RUN <<EOF
 cd stable-diffusion
 git fetch
diff --git a/services/hlky/userconfig_streamlit.yaml b/services/hlky/userconfig_streamlit.yaml
index 9e3a216..f8ebac1 100644
--- a/services/hlky/userconfig_streamlit.yaml
+++ b/services/hlky/userconfig_streamlit.yaml
@@ -6,4 +6,5 @@ general:
   outdir_txt2img: /output/txt2img-samples
   outdir_img2img: /output/img2img-samples
   outdir_img2txt: /output/img2txt
+  optimized: True
   optimized_turbo: True