From b5537dbc78b7f8ba278cbd07d2b36e134fe55e02 Mon Sep 17 00:00:00 2001
From: Abdullah Barhoum <ka70911@gmail.com>
Date: Sun, 28 Aug 2022 13:35:40 +0200
Subject: [PATCH] Update Base to 6b442c0

---
 README.md        | Bin 5242 -> 5298 bytes
 build/Dockerfile |  18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3a97140d16d8587e42b80b742235b648115eda9f..c3eaad50ad3ff842b3c41c57d0a9a986be7d47d7 100644
GIT binary patch
delta 265
zcmeyRu}O1+9&;#z=R`ws)*yybhP=u7tg6ZR40#L+43!M|K#?LKE0-aWA(<hAArmN`
z3gnjqStUTe0#IB5D3%G71&IR<LXrjPE&;2_1Dd4(RG-LD41_sAwTc_<nHd=sCVMiz
zWQ?A;-F#wS5+^SM7lSTPUG(JLOr8__v?lLi^5E8FKnNQ$8-j$5m<<>;HzzVLXXFLR
zA><2LwI`op-NhI^c|W)8<X3F-CQo9sU<J!>KFj`=aq=>D4Q3#B@@~%R$yHnrHaBtG
LF>XG@vx6M~n{q$h

delta 369
zcmYjMJxjw-6g|(DB&Jph3gS?BBB|}r*bWL#B7PJHizrS`F}5`r(_+&?ad#BU{R5pk
zxY-PfgE;vY#Kq0Qe;}Q_c{<4DKJGi`aPGOI!Z?3xCpz%@<+=XHSWm+QH@%B58YOa6
z6{`v>LehPr`EOpL>trc<Ob*4oL>|YuKogg!LBd0TI{zf~GTCyB1qhkz!B(0EmQleG
zb{TaTKShD-Z#9bjJ&SHMBQ4=F9kAgEYP6uu(93j^x*17#+AvkY4))n*164{HYgE;r
zv$itftT^DM4t#9mkmq03idmr2WG-qMuR_@5m{;o_=aek%a>w~XoT>B;bw!)sHZvhQ
wXz}c-^zl6|V?KKHW_~VCSOW~0owdLvvBfGE=gP6pZa!+!Luyk*-&0Te59_>9rvLx|

diff --git a/build/Dockerfile b/build/Dockerfile
index ff0f8a4..7fb4366 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -8,20 +8,34 @@ RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorc
 RUN git clone https://github.com/hlky/stable-diffusion.git && cd stable-diffusion && git reset --hard 554bd068e6f2f6bc55449a67fe017ddd77090f28
 RUN conda env update --file stable-diffusion/environment.yaml --name base && conda clean -a -y
 
-# fonts
+# fonts for generating the grid
 RUN apt-get update && apt install fonts-dejavu-core && apt-get clean
 
+# Note: don't update the sha of previous versions because the install will take forever
+# instead, update the repo state in a later step
+RUN cd stable-diffusion && git pull && git reset --hard 6b442c05296dd350fcf7f752e17c4b4bb015a03b && \
+  conda env update --file environment.yaml --name base && conda clean -a -y
+
+# download latest UI version, update the sha below in case you want some other version
 RUN git clone https://github.com/hlky/stable-diffusion-webui.git && cd stable-diffusion-webui && \
   git reset --hard 33890563d237889aca7cbc4f04ae42b885aee07e && \
   cp -t /stable-diffusion/scripts/ txt2img.yaml webui.py webui.yaml webui_playground.py && \
   cd / && rm -rf stable-diffusion-webui
 
 
+# For testing different versions:
+# RUN git clone https://github.com/AbdBarho/stable-diffusion-webui.git && cd stable-diffusion-webui && \
+#   git checkout respect-cli-params &&\
+#   cp -t /stable-diffusion/scripts/ txt2img.yaml webui.py webui.yaml webui_playground.py && \
+#   cd / && rm -rf stable-diffusion-webui
+
+
 WORKDIR /stable-diffusion
 ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
 
 EXPOSE 7860
-CMD ln -sf /models/model.ckpt /stable-diffusion/models/ldm/stable-diffusion-v1/model.ckpt && \
+CMD \
+  ln -sf /models/model.ckpt /stable-diffusion/models/ldm/stable-diffusion-v1/model.ckpt && \
   ln -sf /models/GFPGANv1.3.pth   /stable-diffusion/src/gfpgan/experiments/pretrained_models/GFPGANv1.3.pth && \
   ln -sf /models/RealESRGAN_x4plus.pth   /stable-diffusion/src/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus.pth && \
   # force facexlib cache