From c1e13867d9d95a01a99dfbb188aefd4c24777e26 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Sun, 16 Oct 2022 16:27:20 +0200
Subject: [PATCH] Update versions (#146)

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/36a0ba357ab0742c3c4a28437b68fb29a235afbe
  - History tab should be working, closes #138
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/bd57d22f2e0ec7eed084bdf2a4c0dcc0ed745daf
- experimental support for the streamlit UI, use the env var
`USE_STREAMLIT`, see the `docker-compose.yml` file, closes #105
  - Don't create issues if it fails, it is still very early in dev.
---
 docker-compose.yml                |  1 +
 services/AUTOMATIC1111/Dockerfile |  4 ++--
 services/hlky/Dockerfile          | 15 +++++++++------
 services/hlky/run.sh              | 10 ++++++++++
 4 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100755 services/hlky/run.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index a4e9412..e42465e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,6 +29,7 @@ services:
     build: ./services/hlky/
     environment:
       - CLI_ARGS=--optimized-turbo
+      - USE_STREAMLIT=0
 
   auto: &automatic
     <<: *base_service
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index 2b163c8..ce56fcc 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -53,7 +53,7 @@ RUN apt-get install jq moreutils -y
 # 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=03d62538aebeff51713619fe808c953bdb70193d
+ARG SHA=36a0ba357ab0742c3c4a28437b68fb29a235afbe
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
@@ -79,4 +79,4 @@ WORKDIR ${WORKDIR}
 EXPOSE 7860
 # run, -u to not buffer stdout / stderr
 CMD /docker/mount.sh && \
-  python3 -u ../../webui.py --listen --port 7860 --hide-ui-dir-config --ckpt-dir ${ROOT}/models/Stable-diffusion ${CLI_ARGS}
+  python3 -u ../../webui.py --listen --port 7860 --ckpt-dir ${ROOT}/models/Stable-diffusion ${CLI_ARGS}
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 146577e..33afb27 100644
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -22,7 +22,7 @@ conda clean -a -y
 EOF
 
 
-ARG BRANCH=dev SHA=fd51bab1ec03543eb57faa954caab879ef2bafe7
+ARG BRANCH=dev SHA=bd57d22f2e0ec7eed084bdf2a4c0dcc0ed745daf
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -34,12 +34,15 @@ EOF
 
 # add info
 COPY . /docker/
-RUN python /docker/info.py /stable-diffusion/frontend/frontend.py && chmod +x /docker/mount.sh
+RUN <<EOF
+python /docker/info.py /stable-diffusion/frontend/frontend.py
+chmod +x /docker/mount.sh /docker/run.sh
+# streamlit
+sed -i -- 's/8501/7860/g' /stable-diffusion/.streamlit/config.toml
+EOF
 
 WORKDIR /stable-diffusion
-ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
+ENV PYTHONPATH="${PYTHONPATH}:${PWD}" STREAMLIT_SERVER_HEADLESS=true USE_STREAMLIT=0 CLI_ARGS=""
 EXPOSE 7860
 
-CMD /docker/mount.sh && \
-  python3 -u scripts/webui.py --outdir /output --ckpt /data/StableDiffusion/model.ckpt ${CLI_ARGS}
-# sed -i -- 's/8501/7860/g' .streamlit/config.toml && STREAMLIT_SERVER_HEADLESS=true python -u -m streamlit run scripts/webui_streamlit.py  --theme.base dark
+CMD /docker/mount.sh && /docker/run.sh
diff --git a/services/hlky/run.sh b/services/hlky/run.sh
new file mode 100755
index 0000000..0c5dbdd
--- /dev/null
+++ b/services/hlky/run.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+echo "USE_STREAMLIT = ${USE_STREAMLIT}"
+if [ "${USE_STREAMLIT}" == "1" ]; then
+  python -u -m streamlit run scripts/webui_streamlit.py
+else
+  python3 -u scripts/webui.py --outdir /output --ckpt /data/StableDiffusion/model.ckpt ${CLI_ARGS}
+fi