From 4464e9d9e99147dcf0785d8bd0a15172b5792668 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Sat, 29 Oct 2022 22:02:35 +0200
Subject: [PATCH 1/5] Update versions (#185)

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/35c45df28b303a05d56a13cb56d4046f08cf8c25
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/091520bed06f913c9f432f9f47ccbe22b46068d7
- lstein:
https://github.com/invoke-ai/InvokeAI/commit/fdf9b1c40c243d6806e787877e42ae4c115790ee
---
 docker-compose.yml                |  6 +++---
 services/AUTOMATIC1111/Dockerfile | 27 ++++++++++++---------------
 services/hlky/Dockerfile          |  9 ++++++---
 services/hlky/mount.sh            |  1 +
 services/lstein/Dockerfile        | 12 +++++-------
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3d5ad96..0cc908f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     <<: *base_service
     profiles: ["hlky"]
     build: ./services/hlky/
-    image: sd-hlky:3
+    image: sd-hlky:4
     environment:
       - CLI_ARGS=--optimized-turbo
       - USE_STREAMLIT=0
@@ -36,7 +36,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:4
+    image: sd-auto:5
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers
 
@@ -51,7 +51,7 @@ services:
     <<: *base_service
     profiles: ["lstein"]
     build: ./services/lstein/
-    image: sd-lstein:3
+    image: sd-lstein:4
     environment:
       - PRELOAD=true
       - CLI_ARGS=
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index d9d6c40..f2def3b 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -36,35 +36,36 @@ ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
 
 RUN pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113
 
-RUN apt-get update && apt install fonts-dejavu-core rsync git -y && apt-get clean
+RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y && apt-get clean
 
 
 RUN <<EOF
 git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
 cd stable-diffusion-webui
-git reset --hard 1eb588cbf19924333b88beaa1ac0041904966640
+git reset --hard d885a4a57b72152745ca76192ef1bdda29e6461d
 pip install -r requirements_versions.txt
 EOF
 
-ENV ROOT=/stable-diffusion-webui \
-  WORKDIR=/stable-diffusion-webui/repositories/stable-diffusion
+
+COPY --from=xformers /wheel.whl xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
+RUN pip install xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl && rm xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
+
+
+ENV ROOT=/stable-diffusion-webui
 
 
 COPY --from=download /git/ ${ROOT}
 RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate
 RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
 
-# TODO: move to top
-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=737eb28faca8be2bb996ee0930ec77d1f7ebd939
+ARG SHA=35c45df28b303a05d56a13cb56d4046f08cf8c25
 RUN <<EOF
 cd stable-diffusion-webui
-git pull --rebase
+git fetch
 git reset --hard ${SHA}
 pip install -r requirements_versions.txt
 EOF
@@ -76,17 +77,13 @@ RUN pip install opencv-python-headless \
   gradio==3.4.1
 # gradio because #173 & https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/2858
 
-COPY --from=xformers /wheel.whl xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
-RUN pip install xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
 
 COPY . /docker
 
-RUN <<EOF
-chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
-EOF
+RUN chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
 
+WORKDIR ${ROOT}/repositories/stable-diffusion
 ENV CLI_ARGS=""
-WORKDIR ${WORKDIR}
 EXPOSE 7860
 # run, -u to not buffer stdout / stderr
 CMD /docker/mount.sh && \
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 877f89d..b704f1f 100644
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -12,17 +12,20 @@ RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorc
 RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
 
 
+ENV PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
+
 RUN <<EOF
 git config --global http.postBuffer 1048576000
-git clone https://github.com/sd-webui/stable-diffusion-webui.git stable-diffusion
+git clone https://github.com/Sygil-Dev/sygil-webui.git stable-diffusion
 cd stable-diffusion
-git reset --hard 1a9c053cb7b6832695771db2555c0adc9b41e95f
+git reset --hard 091520bed06f913c9f432f9f47ccbe22b46068d7
 conda env update --file environment.yaml -n base
 conda clean -a -y
 EOF
 
+RUN apt-get update && apt install libsndfile1 ffmpeg -y && apt-get clean
 
-ARG BRANCH=dev SHA=5f6141ae7c8520b250896c80ac938396164f78df
+ARG BRANCH=master SHA=091520bed06f913c9f432f9f47ccbe22b46068d7
 RUN <<EOF
 cd stable-diffusion
 git fetch
diff --git a/services/hlky/mount.sh b/services/hlky/mount.sh
index c5499a7..cc0dc9d 100755
--- a/services/hlky/mount.sh
+++ b/services/hlky/mount.sh
@@ -16,6 +16,7 @@ MOUNTS["${PWD}/models/custom"]=/data/StableDiffusion
 # hack
 MOUNTS["${PWD}/models/gfpgan/GFPGANv1.3.pth"]=/data/GFPGAN/GFPGANv1.4.pth
 MOUNTS["${PWD}/models/gfpgan/GFPGANv1.4.pth"]=/data/GFPGAN/GFPGANv1.4.pth
+MOUNTS["${PWD}/gfpgan/weights"]=/data/.cache
 
 
 for to_path in "${!MOUNTS[@]}"; do
diff --git a/services/lstein/Dockerfile b/services/lstein/Dockerfile
index 4b4d0e2..6010a77 100644
--- a/services/lstein/Dockerfile
+++ b/services/lstein/Dockerfile
@@ -4,27 +4,25 @@ FROM continuumio/miniconda3:4.12.0
 
 SHELL ["/bin/bash", "-ceuxo", "pipefail"]
 
-ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w  PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
 
 # now it requires python3.9
 RUN conda install python=3.9 && conda clean -a -y
 RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorch && conda clean -a -y
 
-RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
-
-ENV PIP_EXISTS_ACTION=w
+RUN apt-get update && apt install fonts-dejavu-core -y && apt-get clean
 
 RUN <<EOF
 git clone https://github.com/invoke-ai/InvokeAI.git stable-diffusion
 cd stable-diffusion
-git reset --hard 79e79b78aaeedb49afcc795e0e00eebfdbedee96
+git reset --hard 986cc49d7a8441a70c709c04a55016a1c783f2ed
 git config --global http.postBuffer 1048576000
-conda env update --file environment.yml -n base
+# conda env update --file environment.yml -n base
 conda clean -a -y
 EOF
 
 
-ARG BRANCH=development SHA=2b6d78e4363f3eca726228a40b6de832eb0ac040
+ARG BRANCH=development SHA=fdf9b1c40c243d6806e787877e42ae4c115790ee
 RUN <<EOF
 cd stable-diffusion
 git fetch

From d6cbafdca83212e002c68021b8199715b6a0ee71 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Sun, 30 Oct 2022 09:42:30 +0100
Subject: [PATCH 2/5] Scripts support (#187)

Closes #186
---
 {scripts => .devscripts}/migratev1tov2.sh | 0
 docker-compose.yml                        | 2 +-
 services/AUTOMATIC1111/mount.sh           | 5 ++++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename {scripts => .devscripts}/migratev1tov2.sh (100%)

diff --git a/scripts/migratev1tov2.sh b/.devscripts/migratev1tov2.sh
similarity index 100%
rename from scripts/migratev1tov2.sh
rename to .devscripts/migratev1tov2.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 0cc908f..76fbbcb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,7 +36,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:5
+    image: sd-auto:6
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers
 
diff --git a/services/AUTOMATIC1111/mount.sh b/services/AUTOMATIC1111/mount.sh
index 149f318..82dda83 100755
--- a/services/AUTOMATIC1111/mount.sh
+++ b/services/AUTOMATIC1111/mount.sh
@@ -2,7 +2,7 @@
 
 set -Eeuo pipefail
 
-mkdir -p /data/config/auto/
+mkdir -p /data/config/auto/scripts/
 cp -n /docker/config.json /data/config/auto/config.json
 jq '. * input' /data/config/auto/config.json /docker/config.json | sponge /data/config/auto/config.json
 
@@ -10,6 +10,9 @@ if [ ! -f /data/config/auto/ui-config.json ]; then
   echo '{}' >/data/config/auto/ui-config.json
 fi
 
+# copy scripts, we cannot just mount the directory because it will override the already provided scripts in the repo
+cp -rfT /data/config/auto/scripts/ "${ROOT}/scripts"
+
 declare -A MOUNTS
 
 MOUNTS["/root/.cache"]="/data/.cache"

From a5218b86390d3c31de445aa969d6eb4ba04584a2 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Sun, 30 Oct 2022 10:01:18 +0100
Subject: [PATCH 3/5] Auto Extensions (#176)

Closes #148
Closes #172
---
 .devscripts/chmod.sh                               |  2 +-
 docker-compose.yml                                 |  2 +-
 services/AUTOMATIC1111/Dockerfile                  |  6 +++---
 services/AUTOMATIC1111/{mount.sh => entrypoint.sh} | 11 +++++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)
 rename services/AUTOMATIC1111/{mount.sh => entrypoint.sh} (89%)

diff --git a/.devscripts/chmod.sh b/.devscripts/chmod.sh
index d4af583..d925b42 100755
--- a/.devscripts/chmod.sh
+++ b/.devscripts/chmod.sh
@@ -2,4 +2,4 @@
 
 set -Eeuo pipefail
 
-find . -name "*.sh" -exec git update-index --chmod=+x {} \;
+find services -name "*.sh" -exec git update-index --chmod=+x {} \;
diff --git a/docker-compose.yml b/docker-compose.yml
index 76fbbcb..1e1a694 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,7 +36,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:6
+    image: sd-auto:7
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers
 
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index f2def3b..a27f303 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -80,11 +80,11 @@ RUN pip install opencv-python-headless \
 
 COPY . /docker
 
-RUN chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
+RUN chmod +x /docker/entrypoint.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
 
 WORKDIR ${ROOT}/repositories/stable-diffusion
 ENV CLI_ARGS=""
 EXPOSE 7860
+ENTRYPOINT ["/docker/entrypoint.sh"]
 # run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && \
-  python3 -u ../../webui.py --listen --port 7860 --ckpt-dir ${ROOT}/models/Stable-diffusion --theme dark ${CLI_ARGS}
+CMD python3 -u ../../webui.py --listen --port 7860 --ckpt-dir ${ROOT}/models/Stable-diffusion --theme dark ${CLI_ARGS}
diff --git a/services/AUTOMATIC1111/mount.sh b/services/AUTOMATIC1111/entrypoint.sh
similarity index 89%
rename from services/AUTOMATIC1111/mount.sh
rename to services/AUTOMATIC1111/entrypoint.sh
index 82dda83..781e737 100755
--- a/services/AUTOMATIC1111/mount.sh
+++ b/services/AUTOMATIC1111/entrypoint.sh
@@ -2,6 +2,7 @@
 
 set -Eeuo pipefail
 
+# TODO: move all mkdir -p ?
 mkdir -p /data/config/auto/scripts/
 cp -n /docker/config.json /data/config/auto/config.json
 jq '. * input' /data/config/auto/config.json /docker/config.json | sponge /data/config/auto/config.json
@@ -32,6 +33,7 @@ MOUNTS["${ROOT}/models/hypernetworks"]="/data/Hypernetworks"
 MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
 MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json"
 MOUNTS["${ROOT}/ui-config.json"]="/data/config/auto/ui-config.json"
+MOUNTS["${ROOT}/extensions"]="/data/config/auto/extensions"
 
 # extra hacks
 MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache"
@@ -49,3 +51,12 @@ for to_path in "${!MOUNTS[@]}"; do
 done
 
 mkdir -p /output/saved /output/txt2img-images/ /output/img2img-images /output/extras-images/ /output/grids/ /output/txt2img-grids/ /output/img2img-grids/
+
+if [ -f "/data/config/auto/startup.sh" ]; then
+  pushd ${ROOT}
+  . /data/config/auto/startup.sh
+  popd
+fi
+
+
+exec "$@"

From 9092aa233b91af2bb83a11f20b955ad78fe386af Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Tue, 1 Nov 2022 17:12:53 +0100
Subject: [PATCH 4/5] Update versions (#189)

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/dd02889124b2f89aa1d9acafedfa8774e53c98cb
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/d8e61a5cd3c7a6f55a3f94852f54d7c76d29c2ce
---
 docker-compose.yml                | 20 ++++++++++----------
 services/AUTOMATIC1111/Dockerfile |  2 +-
 services/hlky/Dockerfile          |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1e1a694..92d8a90 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,20 +23,11 @@ services:
     volumes:
       - *v1
 
-  hlky:
-    <<: *base_service
-    profiles: ["hlky"]
-    build: ./services/hlky/
-    image: sd-hlky:4
-    environment:
-      - CLI_ARGS=--optimized-turbo
-      - USE_STREAMLIT=0
-
   auto: &automatic
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:7
+    image: sd-auto:8
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers
 
@@ -47,6 +38,15 @@ services:
     environment:
       - CLI_ARGS=--no-half --precision full
 
+  hlky:
+    <<: *base_service
+    profiles: ["hlky"]
+    build: ./services/hlky/
+    image: sd-hlky:5
+    environment:
+      - CLI_ARGS=--optimized-turbo
+      - USE_STREAMLIT=0
+
   lstein:
     <<: *base_service
     profiles: ["lstein"]
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index a27f303..d2b8c5d 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -62,7 +62,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=35c45df28b303a05d56a13cb56d4046f08cf8c25
+ARG SHA=dd02889124b2f89aa1d9acafedfa8774e53c98cb
 RUN <<EOF
 cd stable-diffusion-webui
 git fetch
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index b704f1f..d427b88 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=091520bed06f913c9f432f9f47ccbe22b46068d7
+ARG BRANCH=dev SHA=d8e61a5cd3c7a6f55a3f94852f54d7c76d29c2ce
 RUN <<EOF
 cd stable-diffusion
 git fetch

From fb9d1e579cea4187e9d4da2939c25fa19d3272ff Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Wed, 2 Nov 2022 21:57:01 +0100
Subject: [PATCH 5/5] Update versions (#193)

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/cd5eafaf03a25d2b0e35154666947b9489078af9
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/62f9706d6abf52c7a0facbfddbc22f98e2b3fa85
---
 docker-compose.yml                | 4 ++--
 services/AUTOMATIC1111/Dockerfile | 6 ++----
 services/hlky/Dockerfile          | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 92d8a90..1422685 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:8
+    image: sd-auto:9
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers
 
@@ -42,7 +42,7 @@ services:
     <<: *base_service
     profiles: ["hlky"]
     build: ./services/hlky/
-    image: sd-hlky:5
+    image: sd-hlky:6
     environment:
       - CLI_ARGS=--optimized-turbo
       - USE_STREAMLIT=0
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index d2b8c5d..b843f8a 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -62,7 +62,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=dd02889124b2f89aa1d9acafedfa8774e53c98cb
+ARG SHA=cd5eafaf03a25d2b0e35154666947b9489078af9
 RUN <<EOF
 cd stable-diffusion-webui
 git fetch
@@ -73,9 +73,7 @@ EOF
 RUN pip install opencv-python-headless \
   git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
   git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
-  pyngrok \
-  gradio==3.4.1
-# gradio because #173 & https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/2858
+  pyngrok
 
 
 COPY . /docker
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index d427b88..75d1b40 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=dev SHA=d8e61a5cd3c7a6f55a3f94852f54d7c76d29c2ce
+ARG BRANCH=dev SHA=62f9706d6abf52c7a0facbfddbc22f98e2b3fa85
 RUN <<EOF
 cd stable-diffusion
 git fetch