Merge 5a8e6dccd9 into 802d0bcd68

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/
2025-10-27 16:24:26 -04:00 · 2024-06-23 13:52:54 -06:00 · 2024-06-23 11:16:21 +02:00 · 2024-06-07 19:10:28 +02:00 · 2024-05-28 19:39:33 +02:00 · 2024-05-20 14:44:41 +02:00
11 changed files with 120 additions and 140 deletions
--- 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
--- 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:
@@ -34,6 +26,14 @@ This repository provides multiple UIs for you to play around with stable diffusi
 | -------------------------------------------------------------------------------- |
 | ![](https://github.com/comfyanonymous/ComfyUI/raw/master/comfyui_screenshot.png) |

+### [Fooocus](https://github.com/comfyanonymous/ComfyUI)
+
+[Full feature list here](https://github.com/lllyasviel/Fooocus#fooocus), Screenshot:
+
+| Simplified UI                                                                    |
+| -------------------------------------------------------------------------------- |
+| ![](https://github.com/lllyasviel/Fooocus/assets/19834515/483fb86d-c9a2-4c20-997c-46dafc124f25) |
+
 ## Contributing

 Contributions are welcome! **Create a discussion first of what the problem is and what you want to contribute (before you implement anything)**
--- 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"
@@ -29,7 +27,7 @@ services:
    <<: *base_service
    profiles: ["auto"]
    build: ./services/AUTOMATIC1111
-    image: sd-auto:71
+    image: sd-auto:78
    environment:
      - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api

@@ -40,27 +38,11 @@ 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:30
-    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"]
    build: ./services/comfy/
-    image: sd-comfy:6
+    image: sd-comfy:7
    environment:
      - CLI_ARGS=

@@ -71,3 +53,11 @@ services:
    deploy: {}
    environment:
      - CLI_ARGS=--cpu
+
+  fooocus: &fooocus
+    <<: *base_service
+    profiles: ["fooocus"]
+    build: ./services/fooocus/
+    image: sd-fooocus:3
+    environment:
+      - CLI_ARGS=
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -2,20 +2,19 @@ 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
 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 pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime

 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1

@@ -31,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 cf2772fab0af5573da775e7437e6acdca424f26e && \
+  git reset --hard v1.9.4 && \
  pip install -r requirements_versions.txt


@@ -39,16 +38,14 @@ 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 \
+  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

-# there seems to be a memory leak (or maybe just memory not being freed fast eno8ugh) that is fixed by this version of malloc
+# there seems to be a memory leak (or maybe just memory not being freed fast enough) that is fixed by this version of malloc
 # maybe move this up to the dependencies list.
 RUN apt-get -y install libgoogle-perftools-dev && apt-get clean
 ENV LD_PRELOAD=libtcmalloc.so
--- 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}
--- a/services/download/Dockerfile
+++ b/services/download/Dockerfile
@@ -1,6 +1,6 @@
-FROM bash:alpine3.15
+FROM bash:alpine3.19

-RUN apk add parallel aria2
+RUN apk update && apk add parallel aria2
 COPY . /docker
 RUN chmod +x /docker/download.sh
 ENTRYPOINT ["/docker/download.sh"]
--- a/services/fooocus/Dockerfile
+++ b/services/fooocus/Dockerfile
@@ -0,0 +1,47 @@
+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.0.1-cuda11.7-cudnn8-runtime
+
+ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
+
+RUN apt-get update && apt-get install -y git && apt-get clean
+
+# add in required packages
+RUN apt-get install 'libglib2.0-0'  -y
+RUN apt-get install 'libgl1-mesa-glx' -y
+RUN apt-get install 'python-dev' -y
+
+# set this to your target branch commit
+ARG BRANCH=main SHA=e2f9bcb11d06216d6800676c48d8d74d6fd77a4b
+
+ENV ROOT=/stable-diffusion
+RUN --mount=type=cache,target=/root/.cache/pip \
+  git clone https://github.com/lllyasviel/Fooocus.git ${ROOT} && \
+  cd ${ROOT} && \
+  git checkout ${BRANCH} && \
+  git reset --hard ${SHA} && \
+  pip install -r requirements_versions.txt
+
+
+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 /xformers-0.0.21-cp310-cp310-linux_x86_64.whl
+
+WORKDIR ${ROOT}
+
+RUN --mount=type=cache,target=/root/.cache/pip \
+  git fetch && \
+  git checkout ${BRANCH} && \
+  git reset --hard ${SHA} && \
+  pip install -r requirements_versions.txt
+
+# add info
+COPY . /docker/
+RUN cp /docker/config.txt ${ROOT}
+RUN chmod u+x /docker/entrypoint.sh
+
+EXPOSE 7860
+ENTRYPOINT ["/docker/entrypoint.sh"]
+CMD python -u entry_with_update.py --listen --port 7860 ${CLI_ARGS}
--- a/services/fooocus/config.txt
+++ b/services/fooocus/config.txt
@@ -0,0 +1,12 @@
+{
+    "path_checkpoints": "/stable-diffusion/models/checkpoints",
+    "path_loras": "/stable-diffusion/models/loras",
+    "path_embeddings": "/stable-diffusion/models/embeddings",
+    "path_vae_approx": "/stable-diffusion/models/vae_approx",
+    "path_upscale_models": "/stable-diffusion/models/upscale_models",
+    "path_inpaint": "/stable-diffusion/models/inpaint",
+    "path_controlnet": "/stable-diffusion/models/controlnet",
+    "path_clip_vision": "/stable-diffusion/models/clip_vision",
+    "path_fooocus_expansion": "/stable-diffusion/models/prompt_expansion/fooocus_expansion",
+    "path_outputs": "/stable-diffusion/outputs"
+}
--- a/services/fooocus/entrypoint.sh
+++ b/services/fooocus/entrypoint.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+mkdir -vp /data/config/fooocus/wildcards
+
+declare -A MOUNTS
+
+MOUNTS["${ROOT}/outputs"]="/output/fooocus"
+
+# ui specific mounts
+MOUNTS["${ROOT}/models/checkpoints"]=/data/models/Stable-diffusion/
+MOUNTS["${ROOT}/models/loras"]=/data/models/Lora/
+MOUNTS["${ROOT}/models/embeddings"]=/data/models/embeddings/
+MOUNTS["${ROOT}/models/vae_approx"]=/data/models/VAE/
+MOUNTS["${ROOT}/models/upscale_models"]=/data/models/upscale_models/
+MOUNTS["${ROOT}/wildcards"]=/data/config/fooocus/wildcards
+
+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
+
+exec "$@"
--- a/services/invoke/Dockerfile
+++ b/services/invoke/Dockerfile
@@ -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.0.1-cuda11.7-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}
-
--- a/services/invoke/entrypoint.sh
+++ b/services/invoke/entrypoint.sh
@@ -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 "$@"
Author	SHA1	Message	Date
digitallamb	01a36a6378	Merge `5a8e6dccd9` into `802d0bcd68`	2024-06-23 13:52:54 -06:00
AbdBarho	802d0bcd68	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/	2024-06-23 11:16:21 +02:00
mohamednabiel717	b1a26b8041	Update Auto to 1.9.4 (#700 ) `feee37d75f` --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2024-06-07 19:10:28 +02:00
AbdBarho	f1bf3b0943	Bump pytorch containers (#697 ) Closes #696 Closes #694	2024-05-28 19:39:33 +02:00
AbdBarho	35a18b3d46	Update Comfy (#693 ) `276f8fce9f` Closes #676 Closes #674 Refs #686	2024-05-20 14:44:41 +02:00
神楽坂·喵	887e49c495	Add missing assets to auto1111 (#684 ) Closes #683 Co-authored-by: AbdBarho <ka70911@gmail.com>	2024-05-20 13:41:54 +02:00
Derek Palmer (Creative)	7051ce0a44	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.	2024-05-20 13:41:36 +02:00
SachiaLanlus	ac94eac2b5	Update Auto v1.9.3 (#673 ) Closes issue #672 ### Update versions - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/releases/tag/v1.9.3	2024-05-20 13:35:07 +02:00
Paul Lamb	5a8e6dccd9	Merge branch 'adding_fooocus' of github.com:digitallamb/stable-diffusion-webui-docker into adding_fooocus	2024-04-11 16:49:25 -07:00
Paul Lamb	cfc373d1d1	Version bump, fooocus 2.3.1	2024-04-11 16:44:12 -07:00
digitallamb	6168e386b4	Merge branch 'master' into adding_fooocus	2024-04-11 16:24:14 -07:00
AbdBarho	015c2ec829	Pin xformers (for now) (#651 ) Closes #648 Closes #649	2024-02-03 08:50:40 +01:00
AbdBarho	245d1d443f	Update package index (#650 ) Closes #622	2024-02-03 08:17:45 +01:00
Paul Lamb	89e258d20d	Merge branch 'adding_fooocus' of github.com:digitallamb/stable-diffusion-webui-docker into adding_fooocus	2024-01-02 08:25:27 -08:00
digitallamb	4f0e684247	Merge branch 'master' into adding_fooocus	2024-01-02 08:10:46 -08:00
Paul Lamb	ff6e3d6fa8	Adding mount for wildcard functionality	2024-01-02 00:17:55 -08:00
digitallamb	056154766c	Merge branch 'master' into adding_fooocus	2023-12-31 14:38:54 -08:00
Paul Lamb	74813d56e7	Updated readme	2023-12-31 14:32:26 -08:00
Paul Lamb	77cfe4965e	Adding mount points to shared models	2023-12-30 22:20:58 -08:00
Paul Lamb	18fb90ea22	First pass at getting Fooocus working	2023-12-30 20:34:47 -08:00