From 42cc17da74ed28636905bdccb4eeddf1037fc84c Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Fri, 21 Oct 2022 04:28:25 +0200 Subject: [PATCH 1/5] New Url (#161) Closes #159 I am not sure how often we will face this problem again. --- services/download/links.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/download/links.txt b/services/download/links.txt index faafa33..bf52fcb 100644 --- a/services/download/links.txt +++ b/services/download/links.txt @@ -1,4 +1,4 @@ -https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media +https://drive.yerf.org/wl/?id=EBfTrmcCCUAGaQBXVIj5lJmEhjoP1tgl&mode=grid&download=1 out=StableDiffusion/model.ckpt https://github.com/TencentARC/GFPGAN/releases/download/v1.3.4/GFPGANv1.4.pth out=GFPGAN/GFPGANv1.4.pth From 3c544dd7f4bb450a6e6e78d218dff5a4c64d6581 Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Sat, 22 Oct 2022 10:44:39 +0200 Subject: [PATCH 2/5] SD 1.5 (#164) ### Update versions - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/f49c08ea566385db339c6628f65c3a121033f67c - hlky: https://github.com/sd-webui/stable-diffusion-webui/commit/8d1e42b9c50c747d056b0a98f3c2eb7652fb73a7 - lstein: https://github.com/invoke-ai/InvokeAI/commit/554445a985d970200095bbcb109273a49c462682 --- LICENSE | 6 ++++++ README.md | 6 +++--- docker-compose.yml | 3 +++ services/AUTOMATIC1111/Dockerfile | 16 ++++++++-------- services/download/download.sh | 25 +++++++++++++++---------- services/download/links.txt | 8 ++++++++ services/hlky/Dockerfile | 2 +- services/hlky/run.sh | 2 +- services/hlky/userconfig_streamlit.yaml | 13 +++++++------ services/lstein/Dockerfile | 2 +- 10 files changed, 53 insertions(+), 30 deletions(-) diff --git a/LICENSE b/LICENSE index 636ad71..3599d2b 100644 --- a/LICENSE +++ b/LICENSE @@ -92,5 +92,11 @@ use). By using this software, you also agree to the following licenses: https://github.com/CompVis/stable-diffusion/blob/main/LICENSE +https://github.com/sd-webui/stable-diffusion-webui/blob/master/LICENSE +https://github.com/invoke-ai/InvokeAI/blob/main/LICENSE +https://github.com/cszn/BSRGAN/blob/main/LICENSE +https://github.com/sczhou/CodeFormer/blob/master/LICENSE https://github.com/TencentARC/GFPGAN/blob/master/LICENSE https://github.com/xinntao/Real-ESRGAN/blob/master/LICENSE +https://github.com/xinntao/ESRGAN/blob/master/LICENSE +https://github.com/cszn/SCUNet/blob/main/LICENSE diff --git a/README.md b/README.md index a905bfb..ae0f5b6 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ 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 +### hlky (sd-webui) -[hlky's fork](https://github.com/hlky/stable-diffusion-webui) is one of the most popular UIs, with many features: +[hlky's fork](https://github.com/sd-webui/stable-diffusion-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. @@ -42,7 +42,7 @@ Screenshots: -### lstein +### lstein (InvokeAI) [lstein's fork](https://github.com/invoke-ai/InvokeAI) is one of the earliest with a wonderful WebUI. - Text to image, with many samplers diff --git a/docker-compose.yml b/docker-compose.yml index ec5c4b1..d9fb314 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,7 @@ services: <<: *base_service profiles: ["hlky"] build: ./services/hlky/ + image: sd-hlky:1 environment: - CLI_ARGS=--optimized-turbo - USE_STREAMLIT=0 @@ -35,6 +36,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 + image: sd-auto:1 environment: - CLI_ARGS=--allow-code --medvram --xformers @@ -49,6 +51,7 @@ services: <<: *base_service profiles: ["lstein"] build: ./services/lstein/ + image: sd-lstein:1 environment: - PRELOAD=true - CLI_ARGS= diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index c36a90e..6181324 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -20,10 +20,10 @@ EOF RUN git clone https://github.com/crowsonkb/k-diffusion.git repositories/k-diffusion && cd repositories/k-diffusion && git reset --hard f4e99857772fc3a126ba886aadf795a332774878 -FROM python:3.10-slim as xformers -SHELL ["/bin/bash", "-ceuxo", "pipefail"] -RUN pip install gdown -RUN gdown https://drive.google.com/uc?id=1SqwicrLx1TrG_sbbEoIF_3TUHd4EYSmw -O /wheel.whl + +FROM alpine:3 as xformers +RUN apk add aria2 +RUN aria2c --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/2.1.0/xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl' FROM python:3.10-slim @@ -57,15 +57,15 @@ 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=36a0ba357ab0742c3c4a28437b68fb29a235afbe +ARG SHA=f49c08ea566385db339c6628f65c3a121033f67c RUN < Date: Sun, 23 Oct 2022 01:05:28 -0600 Subject: [PATCH 3/5] Tags for CLIP interrogation (#166) This populates a folder with tags for the CLIP interrogator to label images with. I.e. artists, art styles, art mediums, moods and genres, etc. --- services/AUTOMATIC1111/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 6181324..0509322 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -20,6 +20,7 @@ EOF RUN git clone https://github.com/crowsonkb/k-diffusion.git repositories/k-diffusion && cd repositories/k-diffusion && git reset --hard f4e99857772fc3a126ba886aadf795a332774878 +RUN git clone https://github.com/pharmapsychotic/clip-interrogator repositories/clip-interrogator && cd repositories/clip-interrogator && git reset --hard 2486589f24165c8e3b303f84e9dbbea318df83e8 FROM alpine:3 as xformers RUN apk add aria2 @@ -48,6 +49,7 @@ 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 @@ -74,11 +76,11 @@ COPY --from=xformers /wheel.whl xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.wh RUN pip install xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl COPY . /docker + RUN < Date: Mon, 24 Oct 2022 22:17:51 +0200 Subject: [PATCH 4/5] Bump Versions (#171) - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/df0a1f83815c771246a7b1bca85d63feaefad8d1 - hlky: https://github.com/sd-webui/stable-diffusion-webui/commit/bb7fce1a871cc434145d5a2114e5d70cbdafa34d - lstein: https://github.com/invoke-ai/InvokeAI/commit/3081b6b7dd4c2fb1156e7a99dc461012c4ecda35 --- README.md | 6 +++--- docker-compose.yml | 6 +++--- services/AUTOMATIC1111/Dockerfile | 2 +- services/hlky/Dockerfile | 2 +- services/hlky/userconfig_streamlit.yaml | 2 +- services/lstein/Dockerfile | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index ae0f5b6..4607a9b 100644 --- a/README.md +++ b/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: diff --git a/docker-compose.yml b/docker-compose.yml index d9fb314..71df7cc 100644 --- a/docker-compose.yml +++ b/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= diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 0509322..8c5f46a 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/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 < Date: Tue, 25 Oct 2022 21:05:09 +0200 Subject: [PATCH 5/5] Downgrade gradio (#175) Closes #173 --- services/AUTOMATIC1111/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 8c5f46a..6273daa 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -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