Merge branch 'master' into ariafix-167

README.md

@@ -23,16 +23,16 @@ This repository provides multiple UIs for you to play around with stable diffusi
 | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
 | ![](https://user-images.githubusercontent.com/24505302/189541954-46afd772-d0c8-4005-874c-e2eca40c02f2.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541956-5b528de7-1b5d-479f-a1db-d3f5a53afc59.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541957-cf78b352-a071-486d-8889-f26952779a61.jpg) |
 
-### hlky (sd-webui)
+### hlky (sd-webui / sygil-webui)
 
-[hlky's fork](https://github.com/sd-webui/stable-diffusion-webui) is one of the most popular UIs, with many features:
+[hlky's fork](https://github.com/Sygil-Dev/sygil-webui) is one of the most popular UIs, with many features:
 
 - Text to image, with many samplers
 - Image to image, with masking, cropping, in-painting, variations.
 - GFPGAN, RealESRGAN, LDSR, GoBig, GoLatent
 - Loopback, prompt weighting
 - 6GB or even 4GB GPU support!
-- [Full feature list here](https://github.com/sd-webui/stable-diffusion-webui/blob/master/README.md)
+- [Full feature list here](https://github.com/Sygil-Dev/sygil-webui/blob/master/README.md)
 
 Screenshots:
 

docker-compose.yml

@@ -27,7 +27,7 @@ services:
     <<: *base_service
     profiles: ["hlky"]
     build: ./services/hlky/
-    image: sd-hlky:1
+    image: sd-hlky:2
     environment:
       - CLI_ARGS=--optimized-turbo
       - USE_STREAMLIT=0
@@ -36,7 +36,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:1
+    image: sd-auto:2
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers
 
@@ -51,7 +51,7 @@ services:
     <<: *base_service
     profiles: ["lstein"]
     build: ./services/lstein/
-    image: sd-lstein:1
+    image: sd-lstein:2
     environment:
       - PRELOAD=true
       - CLI_ARGS=

services/AUTOMATIC1111/Dockerfile

@@ -59,7 +59,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=f49c08ea566385db339c6628f65c3a121033f67c
+ARG SHA=df0a1f83815c771246a7b1bca85d63feaefad8d1
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
@@ -70,7 +70,9 @@ EOF
 RUN pip install opencv-python-headless \
   git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
   git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
-  pyngrok
+  pyngrok \
+  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

services/hlky/Dockerfile

@@ -22,7 +22,7 @@ conda clean -a -y
 EOF
 
 
-ARG BRANCH=dev SHA=8d1e42b9c50c747d056b0a98f3c2eb7652fb73a7
+ARG BRANCH=dev SHA=bb7fce1a871cc434145d5a2114e5d70cbdafa34d
 RUN <<EOF
 cd stable-diffusion
 git fetch

services/hlky/userconfig_streamlit.yaml

@@ -1,5 +1,5 @@
 general:
-  version: 1.20.0
+  version: 1.24.6
   outdir: /output
   default_model: "Stable Diffusion v1.5"
   default_model_path: /data/StableDiffusion/v1-5-pruned-emaonly.ckpt

services/lstein/Dockerfile

@@ -24,7 +24,7 @@ conda clean -a -y
 EOF
 
 
-ARG BRANCH=development SHA=554445a985d970200095bbcb109273a49c462682
+ARG BRANCH=development SHA=3081b6b7dd4c2fb1156e7a99dc461012c4ecda35
 RUN <<EOF
 cd stable-diffusion
 git fetch