From 70357bf01e94a476416713f4a441f7739e9d4e8a Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Wed, 30 Aug 2023 19:55:06 +0200 Subject: [PATCH 1/5] Auto 1.5.2 (#579) https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/c9c8485bc1e8720aba70f029d25cba1c4abf2b5c --- 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 3f81ee2..b4c1ee0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:63 + image: sd-auto:64 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index abca84f..e09f60b 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -72,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=68f336bd994bed5442ad95bad6b6ad5564a5409a +ARG SHA=c9c8485bc1e8720aba70f029d25cba1c4abf2b5c RUN --mount=type=cache,target=/root/.cache/pip \ cd stable-diffusion-webui && \ git fetch && \ From 59b9762ac7017e1cbe89101642e8794654246865 Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Wed, 30 Aug 2023 20:00:48 +0200 Subject: [PATCH 2/5] Update Comfy (#580) https://github.com/comfyanonymous/ComfyUI/commit/7e941f9f247f9b013a33c2e7d117466108414e99 --- docker-compose.yml | 2 +- services/comfy/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b4c1ee0..b91b990 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,7 +60,7 @@ services: <<: *base_service profiles: ["comfy"] build: ./services/comfy/ - image: sd-comfy:4 + image: sd-comfy:5 environment: - CLI_ARGS= diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index 1cc2600..6d1f6ce 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -24,7 +24,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ WORKDIR ${ROOT} -ARG BRANCH=master SHA=8607c2d42d10b0108de02528e813cc703e58813f +ARG BRANCH=master SHA=7e941f9f247f9b013a33c2e7d117466108414e99 RUN --mount=type=cache,target=/root/.cache/pip \ git fetch && \ git checkout ${BRANCH} && \ From 84740598bc0cb98632db975cffc90b3cd9da6cab Mon Sep 17 00:00:00 2001 From: 66li <37136076+66li@users.noreply.github.com> Date: Fri, 1 Sep 2023 02:04:32 +0800 Subject: [PATCH 3/5] Update generative-models version (#581) Upgrade a dependent library https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/v1.5.2/modules/launch_utils.py#L288C90-L288C130 --------- 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 b91b990..9157684 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:64 + image: sd-auto:65 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index e09f60b..25ffcac 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -14,7 +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 +RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 5c10deee76adad0032b412294130090932317a87 FROM alpine:3.17 as xformers From 630980b1bfb5404ebff662cb0edb7643de08849c Mon Sep 17 00:00:00 2001 From: Sebastian Piechowiak Date: Sat, 9 Sep 2023 15:34:06 +0200 Subject: [PATCH 4/5] Skipping installation of requirements for disabled extensions (#582) Closes #563 --- docker-compose.yml | 2 +- services/AUTOMATIC1111/entrypoint.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9157684..d7e543b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:65 + image: sd-auto:66 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/entrypoint.sh b/services/AUTOMATIC1111/entrypoint.sh index 5cdaacf..52f025f 100755 --- a/services/AUTOMATIC1111/entrypoint.sh +++ b/services/AUTOMATIC1111/entrypoint.sh @@ -62,6 +62,12 @@ shopt -s nullglob # For install.py, please refer to https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Developing-extensions#installpy list=(./extensions/*/install.py) for installscript in "${list[@]}"; do + EXTNAME=`echo $installscript | cut -d '/' -f 3` + # Skip installing dependencies if extension is disabled in config + if `jq -e ".disabled_extensions|any(. == \"$EXTNAME\")" config.json`; then + echo "Skipping disabled extension ($EXTNAME)" + continue + fi PYTHONPATH=${ROOT} python "$installscript" done From 6a34739135eb112667f00943c1fac98ab294716a Mon Sep 17 00:00:00 2001 From: cloudaxes <132535135+cloudaxes@users.noreply.github.com> Date: Sat, 9 Sep 2023 23:10:05 +0900 Subject: [PATCH 5/5] Update Automatic1111 to v1.6.0 (#585) Update Automatic1111 Stable Diffusion Webui to v1.6.0. Closes #583 --------- Co-authored-by: AbdBarho --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d7e543b..93fba1d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:66 + image: sd-auto:67 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 25ffcac..f380f30 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -2,19 +2,17 @@ FROM alpine/git:2.36.2 as download COPY clone.sh /clone.sh -RUN . /clone.sh taming-transformers https://github.com/CompVis/taming-transformers.git 24268930bf1dce879235a7fddd0b2355b84d7ea6 \ - && rm -rf data assets **/*.ipynb -RUN . /clone.sh stable-diffusion-stability-ai https://github.com/Stability-AI/stablediffusion.git 47b6b607fdd31875c9279cd2f4f16b92e4ea958e \ +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 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 5c10deee76adad0032b412294130090932317a87 +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 FROM alpine:3.17 as xformers @@ -40,11 +38,10 @@ RUN --mount=type=cache,target=/cache --mount=type=cache,target=/root/.cache/pip pip install /cache/torch-2.0.1-cp310-cp310-linux_x86_64.whl torchvision --index-url https://download.pytorch.org/whl/cu118 - 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 20ae71faa8ef035c31aa3a410b707d792c8203a3 && \ + git reset --hard 5ef669de080814067961f28357256e8fe27544f4 && \ pip install -r requirements_versions.txt RUN --mount=type=cache,target=/root/.cache/pip \ @@ -55,7 +52,7 @@ ENV ROOT=/stable-diffusion-webui COPY --from=download /repositories/ ${ROOT}/repositories/ -RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate +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 @@ -65,6 +62,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \ git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b + # Note: don't update the sha of previous versions because the install will take forever # instead, update the repo state in a later step @@ -72,7 +70,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=c9c8485bc1e8720aba70f029d25cba1c4abf2b5c +ARG SHA=5ef669de080814067961f28357256e8fe27544f4 RUN --mount=type=cache,target=/root/.cache/pip \ cd stable-diffusion-webui && \ git fetch && \