From 063665eae162dee89bd18c894e423a04676a1ddd Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Tue, 14 Mar 2023 18:30:08 +0100 Subject: [PATCH 1/3] Update Auto (#365) https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/a9fed7c364061ae6efb37f797b6b522cb3cf7aa2 --- 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 67670a5..b6c1058 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:48 + image: sd-auto:49 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 1fa178e..b2d44d8 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -71,7 +71,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=27e319dc4f09a2f040043948e5c52965976f8491 +ARG SHA=a9fed7c364061ae6efb37f797b6b522cb3cf7aa2 RUN --mount=type=cache,target=/root/.cache/pip < Date: Tue, 4 Apr 2023 18:55:14 +0200 Subject: [PATCH 2/3] Enable ControlNet mounts for AUTOMATIC1111 (#385) The ControlNet addon [sd-webui-controlnet](https://github.com/Mikubill/sd-webui-controlnet) requires the `data/ControlNet` folder to be mounted into `models/ControlNet`. This PR enables said mount and adds the ControlNet folder to `.gitignore` file. --------- Co-authored-by: AbdBarho --- data/.gitignore | 1 + docker-compose.yml | 2 +- services/AUTOMATIC1111/entrypoint.sh | 1 + services/download/download.sh | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/.gitignore b/data/.gitignore index cb0a526..0c13125 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -20,3 +20,4 @@ /VAE /embeddings /Lora +/ControlNet diff --git a/docker-compose.yml b/docker-compose.yml index b6c1058..d9043f4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:49 + image: sd-auto:50 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 9463baf..a6e7e04 100755 --- a/services/AUTOMATIC1111/entrypoint.sh +++ b/services/AUTOMATIC1111/entrypoint.sh @@ -35,6 +35,7 @@ MOUNTS["${ROOT}/models/torch_deepdanbooru"]="/data/Deepdanbooru" MOUNTS["${ROOT}/models/BLIP"]="/data/BLIP" MOUNTS["${ROOT}/models/midas"]="/data/MiDaS" MOUNTS["${ROOT}/models/Lora"]="/data/Lora" +MOUNTS["${ROOT}/models/ControlNet"]="/data/ControlNet" MOUNTS["${ROOT}/embeddings"]="/data/embeddings" MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json" diff --git a/services/download/download.sh b/services/download/download.sh index 6f02f9b..15a29ba 100755 --- a/services/download/download.sh +++ b/services/download/download.sh @@ -3,7 +3,7 @@ set -Eeuo pipefail # TODO: maybe just use the .gitignore file to create all of these -mkdir -vp /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings /data/VAE /data/Deepdanbooru /data/MiDaS /data/Lora +mkdir -vp /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings /data/VAE /data/Deepdanbooru /data/MiDaS /data/Lora /data/ControlNet echo "Downloading, this might take a while..." From 5d379bf7bc19e5e672651818587c6b99ab75404b Mon Sep 17 00:00:00 2001 From: Simon Oelerich <54176035+gmasil@users.noreply.github.com> Date: Wed, 5 Apr 2023 19:09:07 +0200 Subject: [PATCH 3/3] Add mounts for `openpose` (#387) Upon enabling the ControlNet addon from https://github.com/AbdBarho/stable-diffusion-webui-docker/pull/385 one might want to use the `openpose` preprocessors. Those are downloaded by the addon the first time they are used. Without proper mounts those networks will be downloaded on usage after each container start. This PR enables those mounts to reduce data traffic. --- data/.gitignore | 1 + docker-compose.yml | 2 +- services/AUTOMATIC1111/entrypoint.sh | 1 + services/download/download.sh | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/.gitignore b/data/.gitignore index 0c13125..5194313 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -21,3 +21,4 @@ /embeddings /Lora /ControlNet +/openpose diff --git a/docker-compose.yml b/docker-compose.yml index d9043f4..e005e77 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:50 + image: sd-auto:51 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 a6e7e04..c6df995 100755 --- a/services/AUTOMATIC1111/entrypoint.sh +++ b/services/AUTOMATIC1111/entrypoint.sh @@ -36,6 +36,7 @@ MOUNTS["${ROOT}/models/BLIP"]="/data/BLIP" MOUNTS["${ROOT}/models/midas"]="/data/MiDaS" MOUNTS["${ROOT}/models/Lora"]="/data/Lora" MOUNTS["${ROOT}/models/ControlNet"]="/data/ControlNet" +MOUNTS["${ROOT}/models/openpose"]="/data/openpose" MOUNTS["${ROOT}/embeddings"]="/data/embeddings" MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json" diff --git a/services/download/download.sh b/services/download/download.sh index 15a29ba..54176d0 100755 --- a/services/download/download.sh +++ b/services/download/download.sh @@ -3,7 +3,7 @@ set -Eeuo pipefail # TODO: maybe just use the .gitignore file to create all of these -mkdir -vp /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings /data/VAE /data/Deepdanbooru /data/MiDaS /data/Lora /data/ControlNet +mkdir -vp /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings /data/VAE /data/Deepdanbooru /data/MiDaS /data/Lora /data/ControlNet /data/openpose echo "Downloading, this might take a while..."