Merge a282e3cf5b into 802d0bcd68

This commit fixes an issue in the `entrypoint.sh` script where the directory was not being changed back to its original location after running the model download script for Krita. The `cd ..` command has been replaced with `cd -`, which correctly returns to the previous working directory, ensuring that subsequent commands in the script are executed from the expected path. This change prevents potential errors and ensures the script behaves as intended.

.devscripts/migratev7tov8.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+echo "Renaming..."
+
+# compatible with default auto-names
+mv -v ./data/StableDiffusion ./data/Stable-diffusion
+mv -v ./data/Deepdanbooru ./data/torch_deepdanbooru
+
+# casing problem on windows
+mv -v ./data/Hypernetworks ./data/hypernetworks1
+mv -v ./data/hypernetworks1 ./data/hypernetworks
+
+mv -v ./data/MiDaS ./data/midas1
+mv -v ./data/midas1 ./data/midas
+
+
+echo "Moving folders..."
+
+mkdir -pv ./final
+
+mv -v ./data/config ./final/config
+mv -v ./data/.cache ./final/.cache
+mv -v ./data/embeddings ./final/embeddings
+mv -v ./data ./final/models
+
+mv -v ./final ./data

.github/ISSUE_TEMPLATE/bug.md

@@ -19,7 +19,7 @@ assignees: ""
 
 **Which UI**
 
-auto or auto-cpu or invoke or sygil?
+auto or auto-cpu or invoke or comfy?
 
 **Hardware / Software**
 

.github/pull_request_template.md

@@ -9,5 +9,5 @@ Closes issue #
 ### Update versions
 
 - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/
-- sygil: https://github.com/Sygil-Dev/sygil-webui/commit/
 - invoke: https://github.com/invoke-ai/InvokeAI/commit/
+- comfy: https://github.com/comfyanonymous/ComfyUI/commit/

.github/workflows/docker.yml

@@ -14,8 +14,7 @@ jobs:
       matrix:
         profile:
           - auto
-          - sygil
-          - invoke
+          - comfy
           - download
     runs-on: ubuntu-latest
     name: ${{ matrix.profile }}

.gitignore

@@ -1,2 +1,7 @@
 /.devcontainer
 /docker-compose.override.yml
+/.env
+
+# VSCode specific
+*.code-workspace
+/.vscode

README.md

@@ -18,21 +18,13 @@ 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 (lstein)](https://github.com/invoke-ai/InvokeAI)
+### [ComfyUI](https://github.com/comfyanonymous/ComfyUI)
 
-[Full feature list here](https://github.com/invoke-ai/InvokeAI#features), Screenshots:
+[Full feature list here](https://github.com/comfyanonymous/ComfyUI#features), Screenshot:
 
-| 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) |
-
-### [Sygil (sd-webui / hlky)](https://github.com/Sygil-Dev/sygil-webui)
-
-[Full feature list here](https://github.com/Sygil-Dev/sygil-webui/blob/master/README.md), Screenshots:
-
-| Text to image                                                                                              | Image to image                                                                                             | Image Lab                                                                                                  |
-| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
-| ![](https://user-images.githubusercontent.com/24505302/189541298-f902b021-a1eb-4e4b-b2eb-b6a696a8ec80.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541295-7d7f2162-2189-4e0a-abbd-703f4779e1cd.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541294-aa7f7735-a973-4e17-ada0-1fe3acbb1772.jpg) |
+| Workflow                                                                         |
+| -------------------------------------------------------------------------------- |
+| ![](https://github.com/comfyanonymous/ComfyUI/raw/master/comfyui_screenshot.png) |
 
 ## Contributing
 
@@ -50,6 +42,7 @@ Special thanks to everyone behind these awesome projects, without them, none of
 
 - [AUTOMATIC1111/stable-diffusion-webui](https://github.com/AUTOMATIC1111/stable-diffusion-webui)
 - [InvokeAI](https://github.com/invoke-ai/InvokeAI)
-- [Sygil-webui](https://github.com/Sygil-Dev/sygil-webui)
+- [ComfyUI](https://github.com/comfyanonymous/ComfyUI)
 - [CompVis/stable-diffusion](https://github.com/CompVis/stable-diffusion)
+- [Sygil-webui](https://github.com/Sygil-Dev/sygil-webui)
 - and many many more.

data/.gitignore

@@ -1,21 +1,4 @@
-# for all of the stuff downloaded by transformers, pytorch, and others
 /.cache
-# for UIs
 /config
-# for all stable diffusion models (main, waifu diffusion, etc..)
-/StableDiffusion
-# others
-/Codeformer
-/GFPGAN
-/ESRGAN
-/BSRGAN
-/RealESRGAN
-/SwinIR
-/MiDaS
-/BLIP
-/ScuNET
-/LDSR
-/Deepdanbooru
-/Hypernetworks
-/VAE
 /embeddings
+/models

docker-compose.yml

@@ -1,18 +1,19 @@
-version: '3.9'
-
 x-base_service: &base_service
     ports:
-      - "7860:7860"
+      - "${WEBUI_PORT:-7860}:7860"
     volumes:
       - &v1 ./data:/data
       - &v2 ./output:/output
+    stop_signal: SIGKILL
+    tty: true
+    env_file: .env
     deploy:
       resources:
         reservations:
           devices:
               - driver: nvidia
                 device_ids: ['0']
-                capabilities: [gpu]
+                capabilities: [compute, utility]
 
 name: webui-docker
 
@@ -27,38 +28,33 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:31
+    image: sd-auto:78
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
+    env_file: .env
 
   auto-cpu:
     <<: *automatic
     profiles: ["auto-cpu"]
     deploy: {}
     environment:
-      - CLI_ARGS=--no-half --precision full
+      - CLI_ARGS=--no-half --precision full --allow-code --enable-insecure-extension-access --api
+    env_file: .env
 
-  invoke:
+  comfy: &comfy
     <<: *base_service
-    profiles: ["invoke"]
-    build: ./services/invoke/
-    image: sd-invoke:17
+    profiles: ["comfy"]
+    build: ./services/comfy/
+    image: sd-comfy:7
     environment:
-      - PRELOAD=true
       - CLI_ARGS=
+    env_file: .env
 
 
-  sygil: &sygil
-    <<: *base_service
-    profiles: ["sygil"]
-    build: ./services/sygil/
-    image: sd-sygil:16
+  comfy-cpu:
+    <<: *comfy
+    profiles: ["comfy-cpu"]
+    deploy: {}
     environment:
-      - CLI_ARGS=--optimized-turbo
-      - USE_STREAMLIT=0
-
-  sygil-sl:
-    <<: *sygil
-    profiles: ["sygil-sl"]
-    environment:
-      - USE_STREAMLIT=1
+      - CLI_ARGS=--cpu
+    env_file: .env

services/AUTOMATIC1111/Dockerfile

@@ -1,93 +1,66 @@
-# syntax=docker/dockerfile:1
-
 FROM alpine/git:2.36.2 as download
 
-SHELL ["/bin/sh", "-ceuxo", "pipefail"]
+COPY clone.sh /clone.sh
 
-RUN <<EOF
-cat <<'EOE' > /clone.sh
-mkdir -p repositories/"$1" && cd repositories/"$1" && git init && git remote add origin "$2" && git fetch origin "$3" --depth=1 && git reset --hard "$3" && rm -rf .git
-EOE
-EOF
+RUN . /clone.sh stable-diffusion-webui-assets https://github.com/AUTOMATIC1111/stable-diffusion-webui-assets.git 6f7db241d2f8ba7457bac5ca9753331f0c266917
 
-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 5b3af030dd83e0297272d861c19477735d0317ec
-RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2486589f24165c8e3b303f84e9dbbea318df83e8
+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 alpine:3 as xformers
-RUN apk add aria2
-RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/4.0.0/xformers-0.0.16rc393-cp310-cp310-manylinux2014_x86_64.whl'
-
-FROM python:3.10-slim
-
-SHELL ["/bin/bash", "-ceuxo", "pipefail"]
+FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 
-RUN PIP_NO_CACHE_DIR=1 pip install torch==1.12.1+cu116 torchvision==0.13.1+cu116 --extra-index-url https://download.pytorch.org/whl/cu116
-
-RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y && apt-get clean
+RUN --mount=type=cache,target=/var/cache/apt \
+  apt-get update && \
+  # we need those
+  apt-get install -y fonts-dejavu-core rsync git jq moreutils aria2 \
+  # extensions needs those
+  ffmpeg libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 libcairo2-dev build-essential
 
 
-RUN --mount=type=cache,target=/root/.cache/pip <<EOF
-git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
-cd stable-diffusion-webui
-git reset --hard 4af3ca5393151d61363c30eef4965e694eeac15e
-pip install -r requirements_versions.txt
-EOF
-
+WORKDIR /
 RUN --mount=type=cache,target=/root/.cache/pip \
-  --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.15-cp310-cp310-linux_x86_64.whl \
-  pip install triton /xformers-0.0.15-cp310-cp310-linux_x86_64.whl
+  git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \
+  cd stable-diffusion-webui && \
+  git reset --hard v1.9.4 && \
+  pip install -r requirements_versions.txt
+
 
 ENV ROOT=/stable-diffusion-webui
 
-
-COPY --from=download /git/ ${ROOT}
-RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate
-RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt
+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 opencv-python-headless \
+  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@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b \
-  pyngrok
+  git+https://github.com/mlfoundations/open_clip.git@v2.20.0
 
-# Note: don't update the sha of previous versions because the install will take forever
-# instead, update the repo state in a later step
-
-ARG SHA=2b94ec78869db7d2beaad23bdff47340416edf85
-RUN --mount=type=cache,target=/root/.cache/pip <<EOF
-cd stable-diffusion-webui
-git fetch
-git reset --hard ${SHA}
-pip install -r requirements_versions.txt
-EOF
-
-RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install -U opencv-python-headless transformers>=4.24
+# 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
 
 COPY . /docker
 
-RUN <<EOF
-python3 /docker/info.py ${ROOT}/modules/ui.py
-mv ${ROOT}/style.css ${ROOT}/user.css
-EOF
+RUN \
+  # 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' /opt/conda/lib/python3.10/site-packages/gradio/routes.py && \
+  git config --global --add safe.directory '*'
 
 WORKDIR ${ROOT}
+ENV NVIDIA_VISIBLE_DEVICES=all
 ENV CLI_ARGS=""
 EXPOSE 7860
 ENTRYPOINT ["/docker/entrypoint.sh"]
-CMD python3 -u webui.py --listen --port 7860 ${CLI_ARGS}
+CMD python -u webui.py --listen --port 7860 ${CLI_ARGS}

services/AUTOMATIC1111/clone.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -Eeuox pipefail
+
+mkdir -p /repositories/"$1"
+cd /repositories/"$1"
+git init
+git remote add origin "$2"
+git fetch origin "$3" --depth=1
+git reset --hard "$3"
+rm -rf .git

services/AUTOMATIC1111/config.json

@@ -1,10 +0,0 @@
-{
-  "outdir_samples": "",
-  "outdir_txt2img_samples": "/output/txt2img",
-  "outdir_img2img_samples": "/output/img2img",
-  "outdir_extras_samples": "/output/extras",
-  "outdir_txt2img_grids": "/output/txt2img-grids",
-  "outdir_img2img_grids": "/output/img2img-grids",
-  "outdir_save": "/output/saved",
-  "font": "DejaVuSans.ttf"
-}

services/AUTOMATIC1111/config.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+
+"""Checks and sets default values for config.json before starting the container."""
+
+import json
+import re
+import os.path
+import sys
+
+DEFAULT_FILEPATH = '/data/config/auto/config.json'
+
+DEFAULT_OUTDIRS = {
+  "outdir_samples": "",
+  "outdir_txt2img_samples": "/output/txt2img",
+  "outdir_img2img_samples": "/output/img2img",
+  "outdir_extras_samples": "/output/extras",
+  "outdir_grids": "",
+  "outdir_txt2img_grids": "/output/txt2img-grids",
+  "outdir_img2img_grids": "/output/img2img-grids",
+  "outdir_save": "/output/saved",
+  "outdir_init_images": "/output/init-images",
+}
+RE_VALID_OUTDIR = re.compile(r"(^/output(/\.?[\w\-\_]+)+/?$)|(^\s?$)")
+
+DEFAULT_OTHER = {
+  "font": "DejaVuSans.ttf",
+}
+
+def dict_to_json_file(target_file: str, data: dict):
+  """Write dictionary to specified json file"""
+
+  with open(target_file, 'w') as f:
+    json.dump(data, f)
+
+def json_file_to_dict(config_file: str) -> dict|None:
+   """Load json file into a dictionary. Return None if file does not exist."""
+
+   if os.path.isfile(config_file):
+    with open(config_file, 'r') as f:
+      return json.load(f)
+   else:
+      return None
+
+def replace_if_invalid(value: str, replacement: str, pattern: str|re.Pattern[str]) -> str:
+  """Returns original value if valid, fallback value if invalid"""
+
+  if re.match(pattern, value):
+    return value
+  else:
+    return replacement
+
+def check_and_replace_config(config_file: str, target_file: str = None):
+  """Checks given file for invalid values. Replaces those with fallback values (default: overwrites file)."""
+
+  # Get current user config, or empty if file does not exists
+  data = json_file_to_dict(config_file) or {}
+
+  # Check and fix output directories
+  for k, def_val in DEFAULT_OUTDIRS.items():
+    if k not in data:
+      data[k] = def_val
+    else:
+      data[k] = replace_if_invalid(value=data[k], replacement=def_val, pattern=RE_VALID_OUTDIR)
+
+  # Check and fix other default settings
+  for k, def_val in DEFAULT_OTHER.items():
+    if k not in data:
+      data[k] = def_val
+
+  # Write results to file
+  dict_to_json_file(target_file or config_file, data)
+
+if __name__ == '__main__':
+  if len(sys.argv) > 1:
+    check_and_replace_config(*sys.argv[1:])
+  else:
+    check_and_replace_config(DEFAULT_FILEPATH)
+

services/AUTOMATIC1111/entrypoint.sh

@@ -4,40 +4,42 @@ set -Eeuo pipefail
 
 # TODO: move all mkdir -p ?
 mkdir -p /data/config/auto/scripts/
-cp -n /docker/config.json /data/config/auto/config.json
-jq '. * input' /data/config/auto/config.json /docker/config.json | sponge /data/config/auto/config.json
+# mount scripts individually
+
+echo $ROOT
+ls -lha $ROOT
+
+find "${ROOT}/scripts/" -maxdepth 1 -type l -delete
+cp -vrfTs /data/config/auto/scripts/ "${ROOT}/scripts/"
+
+# Set up config file
+python /docker/config.py /data/config/auto/config.json
 
 if [ ! -f /data/config/auto/ui-config.json ]; then
   echo '{}' >/data/config/auto/ui-config.json
 fi
 
-# copy scripts, we cannot just mount the directory because it will override the already provided scripts in the repo
-cp -rfT /data/config/auto/scripts/ "${ROOT}/scripts"
+if [ ! -f /data/config/auto/styles.csv ]; then
+  touch /data/config/auto/styles.csv
+fi
+
+# copy models from original models folder
+mkdir -p /data/models/VAE-approx/ /data/models/karlo/
+
+rsync -a --info=NAME ${ROOT}/models/VAE-approx/ /data/models/VAE-approx/
+rsync -a --info=NAME ${ROOT}/models/karlo/ /data/models/karlo/
 
 declare -A MOUNTS
 
 MOUNTS["/root/.cache"]="/data/.cache"
-
-# main
-MOUNTS["${ROOT}/models/Stable-diffusion"]="/data/StableDiffusion"
-MOUNTS["${ROOT}/models/VAE"]="/data/VAE"
-MOUNTS["${ROOT}/models/Codeformer"]="/data/Codeformer"
-MOUNTS["${ROOT}/models/GFPGAN"]="/data/GFPGAN"
-MOUNTS["${ROOT}/models/ESRGAN"]="/data/ESRGAN"
-MOUNTS["${ROOT}/models/BSRGAN"]="/data/BSRGAN"
-MOUNTS["${ROOT}/models/RealESRGAN"]="/data/RealESRGAN"
-MOUNTS["${ROOT}/models/SwinIR"]="/data/SwinIR"
-MOUNTS["${ROOT}/models/ScuNET"]="/data/ScuNET"
-MOUNTS["${ROOT}/models/LDSR"]="/data/LDSR"
-MOUNTS["${ROOT}/models/hypernetworks"]="/data/Hypernetworks"
-MOUNTS["${ROOT}/models/torch_deepdanbooru"]="/data/Deepdanbooru"
-MOUNTS["${ROOT}/models/BLIP"]="/data/BLIP"
-MOUNTS["${ROOT}/models/midas"]="/data/MiDaS"
+MOUNTS["${ROOT}/models"]="/data/models"
 
 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"
+MOUNTS["${ROOT}/config_states"]="/data/config/auto/config_states"
 
 # extra hacks
 MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache"
@@ -54,8 +56,28 @@ for to_path in "${!MOUNTS[@]}"; do
   echo Mounted $(basename "${from_path}")
 done
 
+echo "Installing extension dependencies (if any)"
+
+# because we build our container as root:
+chown -R root ~/.cache/
+chmod 766 ~/.cache/
+
+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
+
 if [ -f "/data/config/auto/startup.sh" ]; then
   pushd ${ROOT}
+  echo "Running startup script"
   . /data/config/auto/startup.sh
   popd
 fi

services/AUTOMATIC1111/info.py

@@ -1,14 +0,0 @@
-import sys
-from pathlib import Path
-
-file = Path(sys.argv[1])
-file.write_text(
-  file.read_text()\
-  .replace('    return demo', """
-    with demo:
-        gr.Markdown(
-          'Created by [AUTOMATIC1111 / stable-diffusion-webui-docker](https://github.com/AbdBarho/stable-diffusion-webui-docker/)'
-        )
-    return demo
-""", 1)
-)

services/comfy/Dockerfile

@@ -0,0 +1,108 @@
+FROM pytorch/pytorch:2.5.1-cuda12.4-cudnn9-runtime
+
+# Limited system user UID
+ARG USE_UID=0
+# Limited system user GID
+ARG USE_GID=0
+# System user name
+ARG USE_USER=root
+# System group name
+ARG USE_GROUP=root
+# Latest tag or bleeding edge commit
+ARG USE_EDGE=false
+# ComfyUI-GGUF
+ARG USE_GGUF=false
+# x-flux-comfyui
+ARG USE_XFLUX=false
+# comfyui_controlnet_aux
+ARG USE_CNAUX=false
+# krita-ai-diffusion
+ARG USE_KRITA=false
+# ComfyUI_IPAdapter_plus
+ARG USE_IPAPLUS=false
+# comfyui-inpaint-nodes
+ARG USE_INPAINT=false
+# comfyui-tooling-nodes
+ARG USE_TOOLING=false
+
+ENV USE_CNAUX=$USE_CNAUX USE_IPAPLUS=$USE_IPAPLUS
+ENV USE_INPAINT=$USE_INPAINT USE_TOOLING=$USE_TOOLING
+ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 USE_EDGE=$USE_EDGE
+ENV USE_GGUF=$USE_GGUF USE_XFLUX=$USE_XFLUX ROOT=/stable-diffusion
+ENV CACHE=/home/$USE_USER/.cache USE_KRITA=$USE_KRITA
+
+RUN mkdir -p ${ROOT} ${CACHE}/pip /home/${USE_USER}
+
+# User/Group
+RUN if [ ${USE_GID} -ne 0 ]; then \
+    groupadd -r ${USE_GROUP} -g ${USE_GID}; \
+  fi; \
+  if [ ${USE_GID} -ne 0 ]; then \
+    useradd --no-log-init -m -r -g ${USE_GROUP} ${USE_USER} -u ${USE_UID}; \
+  fi; \
+  chown -R ${USE_UID}:${USE_GID} ${ROOT} ${CACHE} /home/${USE_USER}
+
+RUN apt-get update && apt-get install -y git python3-pip
+RUN if [ "${USE_XFLUX}" = "true" ] || [ "${USE_KRITA}" = "true" ] || [ "${USE_CNAUX}" = "true" ]; then \
+    apt-get install -y libgl1-mesa-glx python3-opencv; \
+  fi
+RUN apt-get clean
+
+USER ${USE_USER}:${USE_GROUP}
+ENV PATH="${PATH}:/home/${USE_USER}/.local/bin"
+
+RUN --mount=type=cache,uid=${USE_UID},gid=${USE_GID},target=${CACHE} pip --cache-dir=${CACHE}/pip install -U pip
+
+RUN --mount=type=cache,uid=${USE_UID},gid=${USE_GID},target=${CACHE} \
+  git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \
+  cd ${ROOT} && \
+  git checkout master && \
+  bash -c 'VERSION=$(git describe --tags --abbrev=0) && \
+  if [ "${USE_EDGE}" = "true" ]; then VERSION=$(git describe --abbrev=7); fi && \
+  git reset --hard ${VERSION}' && \
+  pip --cache-dir=${CACHE}/pip install -r requirements.txt && \
+  if [ "${USE_KRITA}" = "true" ]; then \
+    git clone https://github.com/Acly/krita-ai-diffusion.git && \
+    cd krita-ai-diffusion && git checkout main && \
+    git submodule update --init && \
+    pip --cache-dir=${CACHE}/pip install aiohttp tqdm && cd ..; \
+  fi; \
+  if [ "${USE_GGUF}" = "true" ]; then \
+    git clone https://github.com/city96/ComfyUI-GGUF.git && \
+    cd ComfyUI-GGUF && git checkout main && \
+    pip --cache-dir=${CACHE}/pip install -r requirements.txt && cd ..; \
+  fi; \
+  if [ "${USE_XFLUX}" = "true" ]; then \
+    git clone https://github.com/XLabs-AI/x-flux-comfyui.git && \
+    cd x-flux-comfyui && git checkout main && \
+    pip --cache-dir=${CACHE}/pip install -r requirements.txt && cd ..; \
+  fi; \
+  if [ "${USE_CNAUX}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then \
+    git clone https://github.com/Fannovel16/comfyui_controlnet_aux.git && \
+    cd comfyui_controlnet_aux && git checkout main && \
+    pip --cache-dir=${CACHE}/pip install -r requirements.txt && \
+    # This extra step to separate onnxruntime installation is required to restore onnx cuda support \
+    pip --cache-dir=${CACHE}/pip install onnxruntime && pip --cache-dir=${CACHE}/pip install onnxruntime-gpu && cd ..; \
+  fi; \
+  if [ "${USE_IPAPLUS}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then \
+    git clone https://github.com/cubiq/ComfyUI_IPAdapter_plus.git && \
+    cd ComfyUI_IPAdapter_plus && git checkout main && cd ..; \
+  fi; \
+  if [ "${USE_INPAINT}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then \
+    git clone https://github.com/Acly/comfyui-inpaint-nodes.git && \
+    cd comfyui-inpaint-nodes && git checkout main && \
+    pip --cache-dir=${CACHE}/pip install opencv-python && cd ..; \
+  fi; \
+  if [ "${USE_TOOLING}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then \
+    git clone https://github.com/Acly/comfyui-tooling-nodes.git && \
+    cd comfyui-tooling-nodes && git checkout main && cd ..; \
+  fi
+
+WORKDIR ${ROOT}
+COPY --chown=${USE_UID}:${USE_GID} . /docker/
+RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml ${ROOT}
+
+ENV NVIDIA_VISIBLE_DEVICES=all PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
+EXPOSE 7860
+ENTRYPOINT ["/docker/entrypoint.sh"]
+CMD python3 -u main.py --listen --port 7860 ${CLI_ARGS}

services/comfy/entrypoint.sh

@@ -0,0 +1,80 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+CUSTOM_NODES="/data/config/comfy/custom_nodes"
+mkdir -vp "${CUSTOM_NODES}"
+
+declare -A MOUNTS
+
+MOUNTS["${CACHE}"]="/data/.cache"
+MOUNTS["${ROOT}/input"]="/data/config/comfy/input"
+MOUNTS["${ROOT}/output"]="/output/comfy"
+
+for to_path in "${!MOUNTS[@]}"; do
+  set -Eeuo pipefail
+  from_path="${MOUNTS[${to_path}]}"
+  rm -rf "${to_path}"
+  if [ ! -f "$from_path" ]; then
+    mkdir -vp "$from_path"
+  fi
+  mkdir -vp "$(dirname "${to_path}")"
+  ln -sT "${from_path}" "${to_path}"
+  echo Mounted $(basename "${from_path}")
+done
+
+if [ "${UPDATE_CUSTOM_NODES:-false}" = "true" ]; then
+  find /data/config/comfy/custom_nodes/ -mindepth 1 -maxdepth 1 -type d | while read NODE
+    do echo "---- ${NODE##*/} ----"
+    set +e
+    cd "$NODE" && git pull; cd ..;
+    set -e
+  done
+fi
+
+if [ "${USE_KRITA}" = "true" ]; then
+  [ -d "${ROOT}/models/upscale_models" ] && rm -rf "${ROOT}/models/upscale_models"
+  if [ ! -L "${ROOT}/models/upscale_models" ]; then
+    cd "${ROOT}/models"
+    ln -sfT /data/models/upscale_models upscale_models && cd ..
+  fi
+  if [ "${KRITA_DOWNLOAD_MODELS:-false}" = "true" ]; then
+    cd "${ROOT}/krita-ai-diffusion/scripts" && python3 download_models.py --verbose --retry-attempts 10 --continue-on-error --recommended /data && cd -
+  fi
+fi
+if [ "${USE_GGUF}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/ComfyUI-GGUF" ] && cp -a "${ROOT}/ComfyUI-GGUF" "${CUSTOM_NODES}"/
+fi
+if [ "${USE_XFLUX}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/x-flux-comfyui" ] && cp -a "${ROOT}/x-flux-comfyui" "${CUSTOM_NODES}"/
+  [ ! -e "/data/models/clip_vision" ] && mkdir -p /data/models/clip_vision
+  [ ! -e "/data/models/clip_vision/model.safetensors" ] && cd /data/models/clip_vision && \
+    python3 -c 'import sys; from urllib.request import urlopen; from pathlib import Path; Path(sys.argv[2]).write_bytes(urlopen(sys.argv[1]).read())' \
+      "https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/model.safetensors" "model.safetensors"
+  [ ! -e "/data/models/xlabs" ] && mkdir -p /data/models/xlabs/{ipadapters,loras,controlnets}
+  [ ! -e "/data/models/xlabs/ipadapters/flux-ip-adapter.safetensors" ] && cd /data/models/xlabs/ipadapters && \
+    python3 -c 'import sys; from urllib.request import urlopen; from pathlib import Path; Path(sys.argv[2]).write_bytes(urlopen(sys.argv[1]).read())' \
+      "https://huggingface.co/XLabs-AI/flux-ip-adapter/resolve/main/ip_adapter.safetensors" "flux-ip-adapter.safetensors"
+  [ -d "${ROOT}/models/xlabs" ] && rm -rf "${ROOT}/models/xlabs"
+  [ ! -e "${ROOT}/models/xlabs" ] && cd "${ROOT}/models" && ln -sT /data/models/xlabs xlabs && cd ..
+fi
+if [ "${USE_CNAUX}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/comfyui_controlnet_aux" ] && cp -a "${ROOT}/comfyui_controlnet_aux" "${CUSTOM_NODES}"/
+fi
+if [ "${USE_IPAPLUS}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/ComfyUI_IPAdapter_plus" ] && cp -a "${ROOT}/ComfyUI_IPAdapter_plus" "${CUSTOM_NODES}"/
+fi
+if [ "${USE_INPAINT}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/comfyui-inpaint-nodes" ] && cp -a "${ROOT}/comfyui-inpaint-nodes" "${CUSTOM_NODES}"/
+fi
+if [ "${USE_TOOLING}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/comfyui-tooling-nodes" ] && cp -a "${ROOT}/comfyui-tooling-nodes" "${CUSTOM_NODES}"/
+fi
+
+if [ -f "/data/config/comfy/startup.sh" ]; then
+  pushd "${ROOT}"
+  . /data/config/comfy/startup.sh
+  popd
+fi
+
+exec "$@"

services/comfy/extra_model_paths.yaml

@@ -0,0 +1,29 @@
+a111:
+  base_path: /data
+
+  checkpoints: models/Stable-diffusion
+  configs: models/Stable-diffusion
+  vae: models/VAE
+  loras: models/Lora
+  upscale_models: |
+    models/RealESRGAN
+    models/ESRGAN
+    models/SwinIR
+    models/GFPGAN
+  hypernetworks: models/hypernetworks
+  controlnet: models/ControlNet
+  gligen: models/GLIGEN
+  clip: models/CLIPEncoder
+  embeddings: embeddings
+  unet: models/unet
+  clip_vision: models/clip_vision
+  xlabs: models/xlabs
+  inpaint: models/inpaint
+  ipadapter: models/ipadapter
+
+  custom_nodes: config/comfy/custom_nodes
+
+  # TODO: I am unsure about these, need more testing
+  # style_models: config/comfy/style_models
+  # t2i_adapter: config/comfy/t2i_adapter
+  # diffusers: config/comfy/diffusers

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"]

services/download/checksums.sha256

@@ -1,8 +1,8 @@
-cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516  /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
-c6bbc15e3224e6973459ba78de4998b80b50112b0ae5b5c67113d56b4e366b19  /data/StableDiffusion/sd-v1-5-inpainting.ckpt
-c6a580b13a5bc05a5e16e4dbb80608ff2ec251a162311590c1f34c013d7f3dab  /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt
-e2cd4703ab14f4d01fd1383a8a8b266f9a5833dacee8e6a79d3bf21a1b6be5ad  /data/GFPGAN/GFPGANv1.4.pth
-4fa0d38905f75ac06eb49a7951b426670021be3018265fd191d2125df9d682f1  /data/RealESRGAN/RealESRGAN_x4plus.pth
-f872d837d3c90ed2e05227bed711af5671a6fd1c9f7d7e91c911a61f155e99da  /data/RealESRGAN/RealESRGAN_x4plus_anime_6B.pth
-c209caecac2f97b4bb8f4d726b70ac2ac9b35904b7fc99801e1f5e61f9210c13  /data/LDSR/model.ckpt
-9d6ad53c5dafeb07200fb712db14b813b527edd262bc80ea136777bdb41be2ba  /data/LDSR/project.yaml
+cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516  /data/models/Stable-diffusion/v1-5-pruned-emaonly.ckpt
+c6bbc15e3224e6973459ba78de4998b80b50112b0ae5b5c67113d56b4e366b19  /data/models/Stable-diffusion/sd-v1-5-inpainting.ckpt
+c6a580b13a5bc05a5e16e4dbb80608ff2ec251a162311590c1f34c013d7f3dab  /data/models/VAE/vae-ft-mse-840000-ema-pruned.ckpt
+e2cd4703ab14f4d01fd1383a8a8b266f9a5833dacee8e6a79d3bf21a1b6be5ad  /data/models/GFPGAN/GFPGANv1.4.pth
+4fa0d38905f75ac06eb49a7951b426670021be3018265fd191d2125df9d682f1  /data/models/RealESRGAN/RealESRGAN_x4plus.pth
+f872d837d3c90ed2e05227bed711af5671a6fd1c9f7d7e91c911a61f155e99da  /data/models/RealESRGAN/RealESRGAN_x4plus_anime_6B.pth
+c209caecac2f97b4bb8f4d726b70ac2ac9b35904b7fc99801e1f5e61f9210c13  /data/models/LDSR/model.ckpt
+9d6ad53c5dafeb07200fb712db14b813b527edd262bc80ea136777bdb41be2ba  /data/models/LDSR/project.yaml

services/download/download.sh

@@ -3,11 +3,19 @@
 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
+mkdir -vp /data/.cache \
+  /data/embeddings \
+  /data/config/ \
+  /data/models/ \
+  /data/models/Stable-diffusion \
+  /data/models/GFPGAN \
+  /data/models/RealESRGAN \
+  /data/models/LDSR \
+  /data/models/VAE
 
 echo "Downloading, this might take a while..."
 
-aria2c -x 10 --disable-ipv6 --input-file /docker/links.txt --dir /data --continue
+aria2c -x 10 --disable-ipv6 --input-file /docker/links.txt --dir /data/models --continue
 
 echo "Checking SHAs..."
 
@@ -15,14 +23,9 @@ parallel --will-cite -a /docker/checksums.sha256 "echo -n {} | sha256sum -c"
 
 cat <<EOF
 By using this software, you agree to the following licenses:
-https://github.com/CompVis/stable-diffusion/blob/main/LICENSE
 https://github.com/AbdBarho/stable-diffusion-webui-docker/blob/master/LICENSE
-https://github.com/sd-webui/stable-diffusion-webui/blob/master/LICENSE
+https://github.com/CompVis/stable-diffusion/blob/main/LICENSE
+https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/master/LICENSE.txt
 https://github.com/invoke-ai/InvokeAI/blob/main/LICENSE
-https://github.com/cszn/BSRGAN/blob/main/LICENSE
-https://github.com/sczhou/CodeFormer/blob/master/LICENSE
-https://github.com/TencentARC/GFPGAN/blob/master/LICENSE
-https://github.com/xinntao/Real-ESRGAN/blob/master/LICENSE
-https://github.com/xinntao/ESRGAN/blob/master/LICENSE
-https://github.com/cszn/SCUNet/blob/main/LICENSE
+And licenses of all UIs, third party libraries, and extensions.
 EOF

services/download/links.txt

@@ -1,9 +1,9 @@
 https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
-  out=StableDiffusion/v1-5-pruned-emaonly.ckpt
+  out=Stable-diffusion/v1-5-pruned-emaonly.ckpt
 https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt
   out=VAE/vae-ft-mse-840000-ema-pruned.ckpt
 https://huggingface.co/runwayml/stable-diffusion-inpainting/resolve/main/sd-v1-5-inpainting.ckpt
-  out=StableDiffusion/sd-v1-5-inpainting.ckpt
+  out=Stable-diffusion/sd-v1-5-inpainting.ckpt
 https://github.com/TencentARC/GFPGAN/releases/download/v1.3.4/GFPGANv1.4.pth
   out=GFPGAN/GFPGANv1.4.pth
 https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth

services/invoke/Dockerfile

@@ -1,58 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM python:3.10-slim
-SHELL ["/bin/bash", "-ceuxo", "pipefail"]
-
-ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w  PIP_PREFER_BINARY=1
-
-
-RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install torch==1.12.0+cu116 --extra-index-url https://download.pytorch.org/whl/cu116
-
-RUN apt-get update && apt-get install git -y && apt-get clean
-
-RUN git clone https://github.com/invoke-ai/InvokeAI.git /stable-diffusion
-
-WORKDIR /stable-diffusion
-
-RUN --mount=type=cache,target=/root/.cache/pip <<EOF
-git reset --hard 5c31feb3a1096d437c94b6e1c3224eb7a7224a85
-git config --global http.postBuffer 1048576000
-pip install -r binary_installer/py3.10-linux-x86_64-cuda-reqs.txt
-EOF
-
-
-# patch match:
-# https://github.com/invoke-ai/InvokeAI/blob/main/docs/installation/INSTALL_PATCHMATCH.md
-RUN <<EOF
-apt-get update
-# apt-get install build-essential python3-opencv libopencv-dev -y
-apt-get install make g++ libopencv-dev -y
-apt-get clean
-cd /usr/lib/x86_64-linux-gnu/pkgconfig/
-ln -sf opencv4.pc opencv.pc
-EOF
-
-ARG BRANCH=main SHA=26e413ae9cf8dc04c617ca451a91a1624bfdf0c0
-RUN --mount=type=cache,target=/root/.cache/pip <<EOF
-git fetch
-git reset --hard
-git checkout ${BRANCH}
-git reset --hard ${SHA}
-pip install -r binary_installer/py3.10-linux-x86_64-cuda-reqs.txt
-EOF
-
-RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install -U --force-reinstall opencv-python-headless huggingface_hub && \
-  python3 -c "from patchmatch import patch_match"
-
-
-RUN touch invokeai.init
-COPY . /docker/
-
-
-ENV ROOT=/stable-diffusion PYTHONPATH="${PYTHONPATH}:${ROOT}" PRELOAD=false CLI_ARGS=""
-EXPOSE 7860
-
-ENTRYPOINT ["/docker/entrypoint.sh"]
-CMD python3 -u scripts/invoke.py --web --host 0.0.0.0 --port 7860 --config /docker/models.yaml --root_dir ${ROOT} --outdir /output/invoke ${CLI_ARGS}

services/invoke/entrypoint.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-declare -A MOUNTS
-
-# cache
-MOUNTS["/root/.cache"]=/data/.cache/
-
-# ui specific
-MOUNTS["${ROOT}/models/codeformer"]=/data/Codeformer/
-
-MOUNTS["${ROOT}/models/gfpgan/GFPGANv1.4.pth"]=/data/GFPGAN/GFPGANv1.4.pth
-MOUNTS["${ROOT}/models/gfpgan/weights"]=/data/.cache/
-
-MOUNTS["${ROOT}/models/realesrgan"]=/data/RealESRGAN/
-
-MOUNTS["${ROOT}/models/bert-base-uncased"]=/data/.cache/huggingface/transformers/
-MOUNTS["${ROOT}/models/openai/clip-vit-large-patch14"]=/data/.cache/huggingface/transformers/
-MOUNTS["${ROOT}/models/CompVis/stable-diffusion-safety-checker"]=/data/.cache/huggingface/transformers/
-
-MOUNTS["${ROOT}/embeddings"]=/data/embeddings/
-
-# hacks
-MOUNTS["${ROOT}/models/clipseg"]=/data/.cache/invoke/clipseg/
-
-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
-  python3 -u scripts/preload_models.py --skip-sd-weights --root ${ROOT} --config_file /docker/models.yaml
-fi
-
-exec "$@"

services/invoke/models.yaml

@@ -1,23 +0,0 @@
-# This file describes the alternative machine learning models
-# available to InvokeAI script.
-#
-# To add a new model, follow the examples below. Each
-# model requires a model config file, a weights file,
-# and the width and height of the images it
-# was trained on.
-stable-diffusion-1.5:
-  description: Stable Diffusion version 1.5
-  weights: /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
-  vae: /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt
-  config: ./configs/stable-diffusion/v1-inference.yaml
-  width: 512
-  height: 512
-  default: true
-inpainting-1.5:
-  description: RunwayML SD 1.5 model optimized for inpainting
-  weights: /data/StableDiffusion/sd-v1-5-inpainting.ckpt
-  vae: /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt
-  config: ./configs/stable-diffusion/v1-inpainting-inference.yaml
-  width: 512
-  height: 512
-  default: false

services/sygil/Dockerfile

@@ -1,46 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM python:3.8-slim
-
-SHELL ["/bin/bash", "-ceuxo", "pipefail"]
-
-ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
-
-RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.0 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117
-
-RUN apt-get update && apt install gcc libsndfile1 ffmpeg build-essential zip unzip git -y && apt-get clean
-
-RUN --mount=type=cache,target=/root/.cache/pip <<EOF
-git config --global http.postBuffer 1048576000
-git clone https://github.com/Sygil-Dev/sygil-webui.git stable-diffusion
-cd stable-diffusion
-git reset --hard 5291437085bddd16d752f811b6552419a2044d12
-pip install -r requirements.txt
-EOF
-
-
-ARG BRANCH=master SHA=571fb897edd58b714bb385dfaa1ad59aecef8bc7
-RUN --mount=type=cache,target=/root/.cache/pip <<EOF
-cd stable-diffusion
-git fetch
-git checkout ${BRANCH}
-git reset --hard ${SHA}
-pip install -r requirements.txt
-EOF
-
-RUN --mount=type=cache,target=/root/.cache/pip pip install transformers==4.24.0
-
-# add info
-COPY . /docker/
-RUN <<EOF
-python /docker/info.py /stable-diffusion/frontend/frontend.py
-chmod +x /docker/mount.sh /docker/run.sh
-# streamlit
-sed -i -- 's/8501/7860/g' /stable-diffusion/.streamlit/config.toml
-EOF
-
-WORKDIR /stable-diffusion
-ENV PYTHONPATH="${PYTHONPATH}:${PWD}" STREAMLIT_SERVER_HEADLESS=true USE_STREAMLIT=0 CLI_ARGS=""
-EXPOSE 7860
-
-CMD /docker/mount.sh && /docker/run.sh

services/sygil/info.py

@@ -1,13 +0,0 @@
-import sys
-from pathlib import Path
-
-file = Path(sys.argv[1])
-file.write_text(
-  file.read_text()\
-  .replace('<p>For help and advanced usage guides,', """
-  <p>
-    Created using <a href="https://github.com/AbdBarho/stable-diffusion-webui-docker">stable-diffusion-webui-docker</a>.
-  </p>
-  <p>For help and advanced usage guides,
-""", 1)
-)

services/sygil/mount.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-declare -A MOUNTS
-
-ROOT=/stable-diffusion/src
-
-# cache
-MOUNTS["/root/.cache"]=/data/.cache
-# ui specific
-MOUNTS["${PWD}/models/realesrgan"]=/data/RealESRGAN
-MOUNTS["${PWD}/models/ldsr"]=/data/LDSR
-MOUNTS["${PWD}/models/custom"]=/data/StableDiffusion
-
-# hack
-MOUNTS["${PWD}/models/gfpgan/GFPGANv1.3.pth"]=/data/GFPGAN/GFPGANv1.4.pth
-MOUNTS["${PWD}/models/gfpgan/GFPGANv1.4.pth"]=/data/GFPGAN/GFPGANv1.4.pth
-MOUNTS["${PWD}/gfpgan/weights"]=/data/.cache
-
-
-for to_path in "${!MOUNTS[@]}"; do
-  set -Eeuo pipefail
-  from_path="${MOUNTS[${to_path}]}"
-  rm -rf "${to_path}"
-  mkdir -p "$(dirname "${to_path}")"
-  ln -sT "${from_path}" "${to_path}"
-  echo Mounted $(basename "${from_path}")
-done
-
-# streamlit config
-ln -sf /docker/userconfig_streamlit.yaml /stable-diffusion/configs/webui/userconfig_streamlit.yaml

services/sygil/run.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-echo "USE_STREAMLIT = ${USE_STREAMLIT}"
-if [ "${USE_STREAMLIT}" == "1" ]; then
-  python -u -m streamlit run scripts/webui_streamlit.py
-else
-  python3 -u scripts/webui.py --outdir /output --ckpt /data/StableDiffusion/v1-5-pruned-emaonly.ckpt ${CLI_ARGS}
-fi

services/sygil/userconfig_streamlit.yaml

@@ -1,11 +0,0 @@
-# https://github.com/Sygil-Dev/sygil-webui/blob/master/configs/webui/webui_streamlit.yaml
-general:
-  version: 1.24.6
-  outdir: /output
-  default_model: "Stable Diffusion v1.5"
-  default_model_path: /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
-  outdir_txt2img: /output/txt2img
-  outdir_img2img: /output/img2img
-  outdir_img2txt: /output/img2txt
-  optimized: True
-  optimized_turbo: True