From d4874e7c3ada70df4e4c953bbce8d79615f64433 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Sat, 24 Sep 2022 11:10:11 +0200
Subject: [PATCH] Update versions (#96)

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/a2bea2f97aab6ef60afe6534611e646f66226868
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/f585ab1923730339ea75d36b53ac1d5b6cbde500
   - New UI is still in works & extremely unstable
- lstein: No new updates, especially not to the UI
---
 services/AUTOMATIC1111/Dockerfile |  2 +-
 services/hlky/Dockerfile          | 31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index ce1f252..c144a70 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -47,7 +47,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=79e7c392989ad70a1c02cbfe6eb38ee5a78bdbce
+ARG SHA=a2bea2f97aab6ef60afe6534611e646f66226868
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 6024528..2eee852 100644
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -21,20 +21,6 @@ conda env update --file environment.yaml -n base
 conda clean -a -y
 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=2a911049aa07a1a79f8cfc8e05d13b906c23efcf
-RUN <<EOF
-cd stable-diffusion
-git fetch
-git checkout ${BRANCH}
-git reset --hard ${SHA}
-conda env update --file environment.yaml -n base
-conda clean -a -y
-EOF
-
-RUN pip install -U --no-cache-dir pyperclip
 
 # Latent diffusion
 RUN <<EOF
@@ -47,6 +33,21 @@ sed -i -- 's/from ldm/from ldm_latent/g' *.py
 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=f585ab1923730339ea75d36b53ac1d5b6cbde500
+RUN <<EOF
+cd stable-diffusion
+git fetch
+git checkout ${BRANCH}
+git reset --hard ${SHA}
+conda env update --file environment.yaml -n base
+conda clean -a -y
+EOF
+
+RUN pip install -U --no-cache-dir pyperclip
+
 # add info
 COPY . /docker/
 RUN python /docker/info.py /stable-diffusion/frontend/frontend.py && chmod +x /docker/mount.sh
@@ -57,4 +58,4 @@ EXPOSE 7860
 # run, -u to not buffer stdout / stderr
 CMD /docker/mount.sh && \
   python3 -u scripts/webui.py --outdir /output --ckpt /cache/models/model.ckpt --ldsr-dir /latent-diffusion ${CLI_ARGS}
-# STREAMLIT_SERVER_PORT=7860 python -m streamlit run scripts/webui_streamlit.py  --theme.base dark
+  # STREAMLIT_SERVER_PORT=7860 python -m streamlit run scripts/webui_streamlit.py  --theme.base dark