From 76989b39a690353c284043ecfa13a49c8a87dddd Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Thu, 8 Sep 2022 17:56:15 +0200
Subject: [PATCH] Update Versions (#42)

* Update hlky

* Update automatic
---
 AUTOMATIC1111/Dockerfile | 26 ++++++++++++--------------
 hlky/Dockerfile          |  2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/AUTOMATIC1111/Dockerfile b/AUTOMATIC1111/Dockerfile
index fb6cb9e..337f6ae 100644
--- a/AUTOMATIC1111/Dockerfile
+++ b/AUTOMATIC1111/Dockerfile
@@ -24,27 +24,25 @@ git reset --hard db6db585eb9ee48e7315e28603e18531dbc87067
 pip install -U --prefer-binary --no-cache-dir -r requirements.txt
 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 SHA=e92d4cf7476f1897fce376916dfb40755ea7920f
-RUN <<EOF
-cd stable-diffusion-webui
-git pull
-git reset --hard ${SHA}
-pip install -U --prefer-binary --no-cache-dir -r requirements.txt
-EOF
-
 ENV ROOT=/workspace/stable-diffusion-webui \
   WORKDIR=/workspace/stable-diffusion-webui/repositories/stable-diffusion
 
 COPY --from=download /git/ ${ROOT}
+RUN pip install --prefer-binary -U --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
+
+# 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=701f76b29ab8fa9c1d35ae8abce36b99e12d5d08
 RUN <<EOF
-pip install --prefer-binary -U --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
-pip install --prefer-binary -U --no-cache-dir opencv-python-headless markupsafe==2.0.1
+cd stable-diffusion-webui
+git pull
+git reset --hard ${SHA}
+pip install --prefer-binary --no-cache-dir -r requirements.txt
 EOF
 
-ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
+RUN pip install --prefer-binary -U --no-cache-dir opencv-python-headless markupsafe==2.0.1
 
+ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
 
 COPY . /docker
 RUN chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
@@ -52,4 +50,4 @@ RUN chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
 WORKDIR ${WORKDIR}
 EXPOSE 7860
 # run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && python3 -u ../../webui.py --listen ${CLI_ARGS}
+CMD /docker/mount.sh && python3 -u ../../webui.py --listen --port 7860 ${CLI_ARGS}
diff --git a/hlky/Dockerfile b/hlky/Dockerfile
index 4807c38..be121df 100644
--- a/hlky/Dockerfile
+++ b/hlky/Dockerfile
@@ -23,7 +23,7 @@ RUN pip install -U --no-cache-dir pyperclip
 
 # 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 WEBUI_SHA=2b1ac8daf7ea82c6c56eabab7e80ec1c33106a98
+ARG WEBUI_SHA=0dffc3918d596ad36a32ac56ecf4d523f490ae5e
 RUN cd stable-diffusion && git pull && git reset --hard ${WEBUI_SHA} && \
   conda env update --file environment.yaml --name base && conda clean -a -y