From ac94eac2b5b59ef17861e26d924a647688f40386 Mon Sep 17 00:00:00 2001 From: SachiaLanlus Date: Mon, 20 May 2024 19:35:07 +0800 Subject: [PATCH 1/7] Update Auto v1.9.3 (#673) Closes issue #672 ### Update versions - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/releases/tag/v1.9.3 --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a1cc6c2..016d881 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:72 + image: sd-auto:75 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 4c478b3..f4570d7 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -2,13 +2,11 @@ FROM alpine/git:2.36.2 as download COPY clone.sh /clone.sh +RUN . /clone.sh stable-diffusion-webui-assets https://github.com/AUTOMATIC1111/stable-diffusion-webui-assets.git 6f7db241d2f8ba7457bac5ca9753331f0c266917 RUN . /clone.sh stable-diffusion-stability-ai https://github.com/Stability-AI/stablediffusion.git cf1d67a6fd5ea1aa600c4df58e5b47da45f6bdbf \ && rm -rf assets data/**/*.png data/**/*.jpg data/**/*.gif -RUN . /clone.sh CodeFormer https://github.com/sczhou/CodeFormer.git c5b4593074ba6214284d6acd5f1719b6c5d739af \ - && rm -rf assets inputs - RUN . /clone.sh BLIP https://github.com/salesforce/BLIP.git 48211a1594f1321b00f14c9f7a5b4813144b2fb9 RUN . /clone.sh k-diffusion https://github.com/crowsonkb/k-diffusion.git ab527a9a6d347f364e3d185ba6d714e22d80cb3c RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2cf03aaf6e704197fd0dae7c7f96aa59cf1b11c9 @@ -31,7 +29,7 @@ WORKDIR / RUN --mount=type=cache,target=/root/.cache/pip \ git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \ cd stable-diffusion-webui && \ - git reset --hard cf2772fab0af5573da775e7437e6acdca424f26e && \ + git reset --hard v1.9.3 && \ pip install -r requirements_versions.txt @@ -39,8 +37,6 @@ ENV ROOT=/stable-diffusion-webui COPY --from=download /repositories/ ${ROOT}/repositories/ RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/clip_interrogator/data/* ${ROOT}/interrogate -RUN --mount=type=cache,target=/root/.cache/pip \ - pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt RUN --mount=type=cache,target=/root/.cache/pip \ pip install pyngrok xformers==0.0.23.post1 \ From 7051ce0a44048ab5b66f2194384a9892222db344 Mon Sep 17 00:00:00 2001 From: "Derek Palmer (Creative)" Date: Mon, 20 May 2024 07:41:36 -0400 Subject: [PATCH 2/7] Updated docker-compose to remove obsolete version syntax (#692) Removes `version:` syntax in `docker-compose` file. If left in, it throws an obsolete warning. I removed it from the docker-compose file to reduce unnecessary warnings and to keep the code up to current standards. See [Version top-level element (obsolete)](https://docs.docker.com/compose/compose-file/04-version-and-name/#version-top-level-element-obsolete) for reference. --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 016d881..1d3602a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.9' - x-base_service: &base_service ports: - "${WEBUI_PORT:-7860}:7860" From 887e49c495ee9f8cc8f23340d6de2ac9911fed1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E6=A5=BD=E5=9D=82=C2=B7=E5=96=B5?= Date: Mon, 20 May 2024 19:41:54 +0800 Subject: [PATCH 3/7] Add missing assets to auto1111 (#684) Closes #683 Co-authored-by: AbdBarho --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1d3602a..9787226 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:75 + image: sd-auto:76 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index f4570d7..0b43433 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -11,6 +11,7 @@ RUN . /clone.sh BLIP https://github.com/salesforce/BLIP.git 48211a1594f1321b00f1 RUN . /clone.sh k-diffusion https://github.com/crowsonkb/k-diffusion.git ab527a9a6d347f364e3d185ba6d714e22d80cb3c RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2cf03aaf6e704197fd0dae7c7f96aa59cf1b11c9 RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f +RUN . /clone.sh stable-diffusion-webui-assets https://github.com/AUTOMATIC1111/stable-diffusion-webui-assets 6f7db241d2f8ba7457bac5ca9753331f0c266917 FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime From 35a18b3d468fdc277d1ee3f41a2c10823334db64 Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Mon, 20 May 2024 14:44:41 +0200 Subject: [PATCH 4/7] Update Comfy (#693) https://github.com/comfyanonymous/ComfyUI/commit/276f8fce9f5a80b500947fb5745a4dde9e84622d Closes #676 Closes #674 Refs #686 --- docker-compose.yml | 2 +- services/comfy/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9787226..efbbc8e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,7 +58,7 @@ services: <<: *base_service profiles: ["comfy"] build: ./services/comfy/ - image: sd-comfy:6 + image: sd-comfy:7 environment: - CLI_ARGS= diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index f813c68..2de504d 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -1,4 +1,4 @@ -FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime +FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 @@ -9,7 +9,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \ cd ${ROOT} && \ git checkout master && \ - git reset --hard d1f3637a5a944d0607b899babd8ff11d87100503 && \ + git reset --hard 276f8fce9f5a80b500947fb5745a4dde9e84622d && \ pip install -r requirements.txt WORKDIR ${ROOT} From f1bf3b09438b0d2aad1bc30359107fc1e4365a09 Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Tue, 28 May 2024 19:39:33 +0200 Subject: [PATCH 5/7] Bump pytorch containers (#697) Closes #696 Closes #694 --- docker-compose.yml | 4 ++-- services/AUTOMATIC1111/Dockerfile | 4 ++-- services/invoke/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index efbbc8e..b849975 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:76 + image: sd-auto:77 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api @@ -42,7 +42,7 @@ services: <<: *base_service profiles: ["invoke"] build: ./services/invoke/ - image: sd-invoke:30 + image: sd-invoke:31 environment: - PRELOAD=true - CLI_ARGS=--xformers diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 0b43433..6455edd 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -14,7 +14,7 @@ RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-mod RUN . /clone.sh stable-diffusion-webui-assets https://github.com/AUTOMATIC1111/stable-diffusion-webui-assets 6f7db241d2f8ba7457bac5ca9753331f0c266917 -FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime +FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 @@ -40,7 +40,7 @@ COPY --from=download /repositories/ ${ROOT}/repositories/ RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/clip_interrogator/data/* ${ROOT}/interrogate RUN --mount=type=cache,target=/root/.cache/pip \ - pip install pyngrok xformers==0.0.23.post1 \ + pip install pyngrok xformers==0.0.26.post1 \ git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \ git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \ git+https://github.com/mlfoundations/open_clip.git@v2.20.0 diff --git a/services/invoke/Dockerfile b/services/invoke/Dockerfile index 209c368..21c13ec 100644 --- a/services/invoke/Dockerfile +++ b/services/invoke/Dockerfile @@ -3,7 +3,7 @@ RUN apk add --no-cache aria2 RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/6.0.0/xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64-pytorch201.whl' -FROM pytorch/pytorch:2.0.1-cuda11.7-cudnn8-runtime +FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w PIP_PREFER_BINARY=1 From b1a26b80410962500ed7a2a8dd7992dd106cae78 Mon Sep 17 00:00:00 2001 From: mohamednabiel717 <150693133+mohamednabiel717@users.noreply.github.com> Date: Fri, 7 Jun 2024 19:10:28 +0200 Subject: [PATCH 6/7] Update Auto to 1.9.4 (#700) https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/feee37d75f1b168768014e4634dcb156ee649c05 --------- Co-authored-by: AbdBarho --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b849975..d367388 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:77 + image: sd-auto:78 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 6455edd..d595784 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -30,7 +30,7 @@ WORKDIR / RUN --mount=type=cache,target=/root/.cache/pip \ git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \ cd stable-diffusion-webui && \ - git reset --hard v1.9.3 && \ + git reset --hard v1.9.4 && \ pip install -r requirements_versions.txt From 802d0bcd689e3a6fcdb56465c216caac01416816 Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Sun, 23 Jun 2024 11:16:21 +0200 Subject: [PATCH 7/7] Remove invoke (#705) The invoke team already maintains a docker setup for their service, this copy here was maybe relevant 2 years ago when all of this started, but I don't think it makes sense anymore. Refer to invoke's docs to install using docker https://invoke-ai.github.io/InvokeAI/installation/040_INSTALL_DOCKER/ --- .github/workflows/docker.yml | 1 - README.md | 8 ------ docker-compose.yml | 16 ----------- services/invoke/Dockerfile | 53 ----------------------------------- services/invoke/entrypoint.sh | 45 ----------------------------- 5 files changed, 123 deletions(-) delete mode 100644 services/invoke/Dockerfile delete mode 100755 services/invoke/entrypoint.sh diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8bb5799..db5d840 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -14,7 +14,6 @@ jobs: matrix: profile: - auto - - invoke - comfy - download runs-on: ubuntu-latest diff --git a/README.md b/README.md index 95e10c3..071a459 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,6 @@ 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) | -### [InvokeAI](https://github.com/invoke-ai/InvokeAI) - -[Full feature list here](https://github.com/invoke-ai/InvokeAI#features), Screenshots: - -| Text to image | Image to image | Extras | -| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | -| ![](https://user-images.githubusercontent.com/24505302/195158552-39f58cb6-cfcc-4141-9995-a626e3760752.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158553-152a0ab8-c0fd-4087-b121-4823bcd8d6b5.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158548-e118206e-c519-4915-85d6-4c248eb10fc0.jpg) | - ### [ComfyUI](https://github.com/comfyanonymous/ComfyUI) [Full feature list here](https://github.com/comfyanonymous/ComfyUI#features), Screenshot: diff --git a/docker-compose.yml b/docker-compose.yml index d367388..970b612 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,22 +38,6 @@ services: environment: - CLI_ARGS=--no-half --precision full --allow-code --enable-insecure-extension-access --api - invoke: &invoke - <<: *base_service - profiles: ["invoke"] - build: ./services/invoke/ - image: sd-invoke:31 - environment: - - PRELOAD=true - - CLI_ARGS=--xformers - - # invoke-cpu: - # <<: *invoke - # profiles: ["invoke-cpu"] - # environment: - # - PRELOAD=true - # - CLI_ARGS=--always_use_cpu - comfy: &comfy <<: *base_service profiles: ["comfy"] diff --git a/services/invoke/Dockerfile b/services/invoke/Dockerfile deleted file mode 100644 index 21c13ec..0000000 --- a/services/invoke/Dockerfile +++ /dev/null @@ -1,53 +0,0 @@ -FROM alpine:3.17 as xformers -RUN apk add --no-cache aria2 -RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/6.0.0/xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64-pytorch201.whl' - - -FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime - -ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w PIP_PREFER_BINARY=1 - -# patch match: -# https://github.com/invoke-ai/InvokeAI/blob/main/docs/installation/INSTALL_PATCHMATCH.md -RUN --mount=type=cache,target=/var/cache/apt \ - apt-get update && \ - apt-get install make g++ git libopencv-dev -y && \ - apt-get clean && \ - cd /usr/lib/x86_64-linux-gnu/pkgconfig/ && \ - ln -sf opencv4.pc opencv.pc - - -ENV ROOT=/InvokeAI -RUN git clone https://github.com/invoke-ai/InvokeAI.git ${ROOT} -WORKDIR ${ROOT} - -RUN --mount=type=cache,target=/root/.cache/pip \ - git reset --hard f3b2e02921927d9317255b1c3811f47bd40a2bf9 && \ - pip install -e . - - -ARG BRANCH=main SHA=f3b2e02921927d9317255b1c3811f47bd40a2bf9 -RUN --mount=type=cache,target=/root/.cache/pip \ - git fetch && \ - git reset --hard && \ - git checkout ${BRANCH} && \ - git reset --hard ${SHA} && \ - pip install -U -e . - -RUN --mount=type=cache,target=/root/.cache/pip \ - --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.21-cp310-cp310-linux_x86_64.whl \ - pip install -U opencv-python-headless triton /xformers-0.0.21-cp310-cp310-linux_x86_64.whl && \ - python3 -c "from patchmatch import patch_match" - - -COPY . /docker/ - -ENV NVIDIA_VISIBLE_DEVICES=all -ENV PYTHONUNBUFFERED=1 PRELOAD=false HF_HOME=/root/.cache/huggingface CONFIG_DIR=/data/config/invoke CLI_ARGS="" -EXPOSE 7860 - -ENTRYPOINT ["/docker/entrypoint.sh"] -CMD invokeai --web --host 0.0.0.0 --port 7860 --root_dir ${ROOT} --config ${CONFIG_DIR}/models.yaml \ - --outdir /output/invoke --embedding_directory /data/embeddings/ --lora_directory /data/models/Lora \ - --no-nsfw_checker --no-safety_checker ${CLI_ARGS} - diff --git a/services/invoke/entrypoint.sh b/services/invoke/entrypoint.sh deleted file mode 100755 index 348bb2b..0000000 --- a/services/invoke/entrypoint.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -set -Eeuo pipefail - -declare -A MOUNTS - -mkdir -p ${CONFIG_DIR} ${ROOT}/configs/stable-diffusion/ - -# cache -MOUNTS["/root/.cache"]=/data/.cache/ - -# this is really just a hack to avoid migrations -rm -rf ${HF_HOME}/diffusers - -# ui specific -MOUNTS["${ROOT}/models/codeformer"]=/data/models/Codeformer/ -MOUNTS["${ROOT}/models/gfpgan/GFPGANv1.4.pth"]=/data/models/GFPGAN/GFPGANv1.4.pth -MOUNTS["${ROOT}/models/gfpgan/weights"]=/data/models/GFPGAN/ -MOUNTS["${ROOT}/models/realesrgan"]=/data/models/RealESRGAN/ - -MOUNTS["${ROOT}/models/ldm"]=/data/.cache/invoke/ldm/ - -# hacks - -for to_path in "${!MOUNTS[@]}"; do - set -Eeuo pipefail - from_path="${MOUNTS[${to_path}]}" - rm -rf "${to_path}" - mkdir -p "$(dirname "${to_path}")" - # ends with slash, make it! - if [[ "$from_path" == */ ]]; then - mkdir -vp "$from_path" - fi - - ln -sT "${from_path}" "${to_path}" - echo Mounted $(basename "${from_path}") -done - -if "${PRELOAD}" == "true"; then - set -Eeuo pipefail - invokeai-configure --root ${ROOT} --yes - cp ${ROOT}/configs/models.yaml ${CONFIG_DIR}/models.yaml -fi - -exec "$@"