From 076b5747d37620eae2a1211e1405c6d98bd57d14 Mon Sep 17 00:00:00 2001 From: LEv145 <40071054+LEv145@users.noreply.github.com> Date: Fri, 28 Apr 2023 15:42:12 +0200 Subject: [PATCH 1/5] Fix file permissions (#425) https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/424 Co-authored-by: LEv145 --- services/comfy/entrypoint.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 services/comfy/entrypoint.sh diff --git a/services/comfy/entrypoint.sh b/services/comfy/entrypoint.sh old mode 100644 new mode 100755 From 445f3f8bac144adc2645eb68a8e6f0c22020627a Mon Sep 17 00:00:00 2001 From: divens Date: Fri, 28 Apr 2023 19:55:06 +0200 Subject: [PATCH 2/5] Add tty to comfy service (#429) Closes issue #428 Co-authored-by: Dylan Ivens <12586504+divens@users.noreply.github.com> --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 3199435..fd89410 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,6 +68,7 @@ services: profiles: ["comfy"] build: ./services/comfy/ image: sd-comfy:1 + tty: true environment: - CLI_ARGS= From 7b8bc3d74ae33978e78324a6e00499d755db1902 Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Thu, 4 May 2023 06:55:01 +0200 Subject: [PATCH 3/5] LyCORIS - ModelScope (#439) Follow up to #401 Closes #401 Closes #437 --------- Co-authored-by: svupper <56261963+svupper@users.noreply.github.com> Co-authored-by: Ubuntu --- data/.gitignore | 2 ++ docker-compose.yml | 2 +- services/AUTOMATIC1111/entrypoint.sh | 2 ++ services/download/download.sh | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/.gitignore b/data/.gitignore index 5194313..9649426 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -22,3 +22,5 @@ /Lora /ControlNet /openpose +/ModelScope +/LyCORIS diff --git a/docker-compose.yml b/docker-compose.yml index fd89410..a577202 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:51 + image: sd-auto:52 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 c6df995..dd96248 100755 --- a/services/AUTOMATIC1111/entrypoint.sh +++ b/services/AUTOMATIC1111/entrypoint.sh @@ -35,8 +35,10 @@ 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/LyCORIS"]="/data/LyCORIS" MOUNTS["${ROOT}/models/ControlNet"]="/data/ControlNet" MOUNTS["${ROOT}/models/openpose"]="/data/openpose" +MOUNTS["${ROOT}/models/ModelScope"]="/data/ModelScope" 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 54176d0..91e39d9 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 /data/openpose +mkdir -vp /data/.cache /data/StableDiffusion /data/LyCORIS /data/Codeformer /data/ModelScope /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..." From 56b942237e93c113702598e90fe4058c869a220a Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Thu, 4 May 2023 07:29:49 +0200 Subject: [PATCH 4/5] Update Auto (#379) Last version before pytorch 2 https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/5ab7f213bec2f816f9c5644becb32eb72c8ffb89 --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a577202..2853c5c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:52 + image: sd-auto:53 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index a610d0c..19adbef 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -24,8 +24,9 @@ FROM python:3.10.9-slim ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 -RUN --mount=type=cache,target=/root/.cache/pip \ - pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117 +RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117 + +# RUN --mount=type=cache,target=/root/.cache/pip pip install torch==2.0.0+cu118 torchvision --extra-index-url https://download.pytorch.org/whl/cu117 RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y && apt-get clean @@ -61,7 +62,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=a9fed7c364061ae6efb37f797b6b522cb3cf7aa2 +ARG SHA=5ab7f213bec2f816f9c5644becb32eb72c8ffb89 RUN --mount=type=cache,target=/root/.cache/pip \ cd stable-diffusion-webui && \ git fetch && \ @@ -76,7 +77,8 @@ RUN \ python3 /docker/info.py ${ROOT}/modules/ui.py && \ mv ${ROOT}/style.css ${ROOT}/user.css && \ # one of the ugliest hacks I ever wrote \ - sed -i 's/in_app_dir = .*/in_app_dir = True/g' /usr/local/lib/python3.10/site-packages/gradio/routes.py + sed -i 's/in_app_dir = .*/in_app_dir = True/g' /usr/local/lib/python3.10/site-packages/gradio/routes.py && \ + git config --global --add safe.directory '*' WORKDIR ${ROOT} ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility From 2efaeb41cdcfddd17a86db096a26a57b971de32e Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Thu, 4 May 2023 07:48:19 +0200 Subject: [PATCH 5/5] Add styles.csv support (#440) Follow up to #386 after https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/9334 has been merged. Closes #435 --- docker-compose.yml | 2 +- services/AUTOMATIC1111/entrypoint.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2853c5c..e6750be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:53 + image: sd-auto:54 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 dd96248..5f9e243 100755 --- a/services/AUTOMATIC1111/entrypoint.sh +++ b/services/AUTOMATIC1111/entrypoint.sh @@ -15,6 +15,10 @@ if [ ! -f /data/config/auto/ui-config.json ]; then echo '{}' >/data/config/auto/ui-config.json fi +if [ ! -f /data/config/auto/styles.csv ]; then + touch /data/config/auto/styles.csv +fi + declare -A MOUNTS MOUNTS["/root/.cache"]="/data/.cache" @@ -43,6 +47,7 @@ MOUNTS["${ROOT}/models/ModelScope"]="/data/ModelScope" MOUNTS["${ROOT}/embeddings"]="/data/embeddings" MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json" MOUNTS["${ROOT}/ui-config.json"]="/data/config/auto/ui-config.json" +MOUNTS["${ROOT}/styles.csv"]="/data/config/auto/styles.csv" MOUNTS["${ROOT}/extensions"]="/data/config/auto/extensions" # extra hacks