From 6de45b19844207bc0656328c48c00057d7dae207 Mon Sep 17 00:00:00 2001 From: cloudaxes <132535135+cloudaxes@users.noreply.github.com> Date: Sat, 22 Jul 2023 14:23:30 +0900 Subject: [PATCH 1/3] Upgrade k-diffusion to Release 0.0.15 to get access to DPM++ (2M) SDE sampler. (#537) Closes issue #536 --- services/AUTOMATIC1111/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 55a049b..fa08018 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -12,7 +12,7 @@ RUN . /clone.sh CodeFormer https://github.com/sczhou/CodeFormer.git c5b4593074ba && 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 5b3af030dd83e0297272d861c19477735d0317ec +RUN . /clone.sh k-diffusion https://github.com/crowsonkb/k-diffusion.git c9fe758757e022f05ca5a53fa8fac28889e4f1cf RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2486589f24165c8e3b303f84e9dbbea318df83e8 From 09a0f11946d4f600993a6d77afe81853da62cbbb Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Sat, 22 Jul 2023 08:31:17 +0200 Subject: [PATCH 2/3] Add startup script for comfy (#552) Closes #451 --------- Co-authored-by: PassiveLemon --- docker-compose.yml | 2 +- services/comfy/Dockerfile | 2 ++ services/comfy/entrypoint.sh | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 815a9bf..2b6c49d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,7 +60,7 @@ services: <<: *base_service profiles: ["comfy"] build: ./services/comfy/ - image: sd-comfy:3 + image: sd-comfy:4 environment: - CLI_ARGS= diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index 69aaf49..1cc2600 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -34,6 +34,8 @@ RUN --mount=type=cache,target=/root/.cache/pip \ # add info COPY . /docker/ RUN cp /docker/extra_model_paths.yaml ${ROOT} +RUN chmod u+x /docker/entrypoint.sh +RUN cp /docker/extra_model_paths.yaml ${ROOT} ENV NVIDIA_VISIBLE_DEVICES=all ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS="" diff --git a/services/comfy/entrypoint.sh b/services/comfy/entrypoint.sh index f5a7430..b4299a7 100755 --- a/services/comfy/entrypoint.sh +++ b/services/comfy/entrypoint.sh @@ -22,4 +22,10 @@ for to_path in "${!MOUNTS[@]}"; do echo Mounted $(basename "${from_path}") done +if [ -f "/data/config/comfy/startup.sh" ]; then + pushd ${ROOT} + . /data/config/comfy/startup.sh + popd +fi + exec "$@" From def76291f808cb249f8cfe35d8424a16a6a4c2f7 Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Sun, 30 Jul 2023 15:42:32 +0200 Subject: [PATCH 3/3] Update Automatic1111 to 1.5.1 to add compatibility for SDXL (#560) Uses the latest release of https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f Tested with the official SDXL 1.0 model from https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/blob/main/sd_xl_base_1.0.safetensors and official refiner from https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0/blob/main/sd_xl_refiner_1.0.safetensors. VAE: https://huggingface.co/stabilityai/sdxl-vae/blob/main/sdxl_vae.safetensors Closes #558 Closes #559 https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/68f336bd994bed5442ad95bad6b6ad5564a5409a --------- Co-authored-by: AbdBarho --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2b6c49d..3f81ee2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:62 + image: sd-auto:63 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index fa08018..abca84f 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -14,6 +14,7 @@ RUN . /clone.sh CodeFormer https://github.com/sczhou/CodeFormer.git c5b4593074ba RUN . /clone.sh BLIP https://github.com/salesforce/BLIP.git 48211a1594f1321b00f14c9f7a5b4813144b2fb9 RUN . /clone.sh k-diffusion https://github.com/crowsonkb/k-diffusion.git c9fe758757e022f05ca5a53fa8fac28889e4f1cf RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2486589f24165c8e3b303f84e9dbbea318df83e8 +RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f FROM alpine:3.17 as xformers @@ -71,7 +72,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ RUN apt-get -y install libgoogle-perftools-dev && apt-get clean ENV LD_PRELOAD=libtcmalloc.so -ARG SHA=394ffa7b0a7fff3ec484bcd084e673a8b301ccc8 +ARG SHA=68f336bd994bed5442ad95bad6b6ad5564a5409a RUN --mount=type=cache,target=/root/.cache/pip \ cd stable-diffusion-webui && \ git fetch && \