mirror of
				https://github.com/AbdBarho/stable-diffusion-webui-docker.git
				synced 2025-11-03 18:53:14 -05:00 
			
		
		
		
	Compare commits
	
		
			30 Commits
		
	
	
		
			8.0.0
			...
			6a0366cf45
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					6a0366cf45 | ||
| 
						 | 
					802d0bcd68 | ||
| 
						 | 
					b1a26b8041 | ||
| 
						 | 
					f1bf3b0943 | ||
| 
						 | 
					35a18b3d46 | ||
| 
						 | 
					887e49c495 | ||
| 
						 | 
					7051ce0a44 | ||
| 
						 | 
					ac94eac2b5 | ||
| 
						 | 
					015c2ec829 | ||
| 
						 | 
					245d1d443f | ||
| 
						 | 
					60c4832185 | ||
| 
						 | 
					f613639748 | ||
| 
						 | 
					fbc5c359d0 | ||
| 
						 | 
					90affeb72a | ||
| 
						 | 
					3e67f559d4 | ||
| 
						 | 
					a2561f2659 | ||
| 
						 | 
					6a34739135 | ||
| 
						 | 
					630980b1bf | ||
| 
						 | 
					84740598bc | ||
| 
						 | 
					59b9762ac7 | ||
| 
						 | 
					70357bf01e | ||
| 
						 | 
					def76291f8 | ||
| 
						 | 
					09a0f11946 | ||
| 
						 | 
					6de45b1984 | ||
| 
						 | 
					103e11493b | ||
| 
						 | 
					95e96602f9 | ||
| 
						 | 
					37a82af4b7 | ||
| 
						 | 
					5e28222332 | ||
| 
						 | 
					6c45e0c2ef | ||
| 
						 | 
					6365811f35 | 
							
								
								
									
										2
									
								
								.github/ISSUE_TEMPLATE/bug.md
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/ISSUE_TEMPLATE/bug.md
									
									
									
									
										vendored
									
									
								
							@@ -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**
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								.github/pull_request_template.md
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/pull_request_template.md
									
									
									
									
										vendored
									
									
								
							@@ -9,6 +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/
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								.github/workflows/docker.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/docker.yml
									
									
									
									
										vendored
									
									
								
							@@ -14,7 +14,6 @@ jobs:
 | 
			
		||||
      matrix:
 | 
			
		||||
        profile:
 | 
			
		||||
          - auto
 | 
			
		||||
          - invoke
 | 
			
		||||
          - comfy
 | 
			
		||||
          - download
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
 
 | 
			
		||||
@@ -18,14 +18,6 @@ This repository provides multiple UIs for you to play around with stable diffusi
 | 
			
		||||
| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
 | 
			
		||||
|  |  |  |
 | 
			
		||||
 | 
			
		||||
### [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                                                                                                     |
 | 
			
		||||
| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
 | 
			
		||||
|  |  |  |
 | 
			
		||||
 | 
			
		||||
### [ComfyUI](https://github.com/comfyanonymous/ComfyUI)
 | 
			
		||||
 | 
			
		||||
[Full feature list here](https://github.com/comfyanonymous/ComfyUI#features), Screenshot:
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,6 @@
 | 
			
		||||
version: '3.9'
 | 
			
		||||
 | 
			
		||||
x-base_service: &base_service
 | 
			
		||||
    ports:
 | 
			
		||||
      - "7860:7860"
 | 
			
		||||
      - "${WEBUI_PORT:-7860}:7860"
 | 
			
		||||
    volumes:
 | 
			
		||||
      - &v1 ./data:/data
 | 
			
		||||
      - &v2 ./output:/output
 | 
			
		||||
@@ -29,7 +27,7 @@ services:
 | 
			
		||||
    <<: *base_service
 | 
			
		||||
    profiles: ["auto"]
 | 
			
		||||
    build: ./services/AUTOMATIC1111
 | 
			
		||||
    image: sd-auto:59
 | 
			
		||||
    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:3
 | 
			
		||||
    image: sd-comfy:7
 | 
			
		||||
    environment:
 | 
			
		||||
      - CLI_ARGS=
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -2,26 +2,19 @@ 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-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 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.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 python:3.10.9-slim
 | 
			
		||||
FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime
 | 
			
		||||
 | 
			
		||||
ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 | 
			
		||||
 | 
			
		||||
@@ -30,61 +23,39 @@ RUN --mount=type=cache,target=/var/cache/apt \
 | 
			
		||||
  # 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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
RUN --mount=type=cache,target=/cache --mount=type=cache,target=/root/.cache/pip \
 | 
			
		||||
  aria2c -x 5 --dir /cache --out torch-2.0.1-cp310-cp310-linux_x86_64.whl -c \
 | 
			
		||||
  https://download.pytorch.org/whl/cu118/torch-2.0.1%2Bcu118-cp310-cp310-linux_x86_64.whl && \
 | 
			
		||||
  pip install /cache/torch-2.0.1-cp310-cp310-linux_x86_64.whl torchvision --index-url https://download.pytorch.org/whl/cu118
 | 
			
		||||
 | 
			
		||||
  ffmpeg libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 libcairo2-dev build-essential
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
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 20ae71faa8ef035c31aa3a410b707d792c8203a3 && \
 | 
			
		||||
  git reset --hard v1.9.4 && \
 | 
			
		||||
  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.dev544-cp310-cp310-manylinux2014_x86_64.whl \
 | 
			
		||||
  pip install /xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64.whl
 | 
			
		||||
 | 
			
		||||
ENV ROOT=/stable-diffusion-webui
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
COPY --from=download /repositories/ ${ROOT}/repositories/
 | 
			
		||||
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
 | 
			
		||||
RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/clip_interrogator/data/* ${ROOT}/interrogate
 | 
			
		||||
 | 
			
		||||
RUN --mount=type=cache,target=/root/.cache/pip \
 | 
			
		||||
  pip install pyngrok \
 | 
			
		||||
  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
 | 
			
		||||
  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
 | 
			
		||||
 | 
			
		||||
# TODO: either remove if fixed in A1111 (unlikely) or move to the top with other apt stuff
 | 
			
		||||
# 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
 | 
			
		||||
 | 
			
		||||
ARG SHA=20ae71faa8ef035c31aa3a410b707d792c8203a3
 | 
			
		||||
RUN --mount=type=cache,target=/root/.cache/pip \
 | 
			
		||||
  cd stable-diffusion-webui && \
 | 
			
		||||
  git fetch && \
 | 
			
		||||
  git reset --hard ${SHA} && \
 | 
			
		||||
  pip install -r requirements_versions.txt
 | 
			
		||||
 | 
			
		||||
COPY . /docker
 | 
			
		||||
 | 
			
		||||
RUN \
 | 
			
		||||
  python3 /docker/info.py ${ROOT}/modules/ui.py && \
 | 
			
		||||
  mv ${ROOT}/style.css ${ROOT}/user.css && \
 | 
			
		||||
  # 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' /opt/conda/lib/python3.10/site-packages/gradio/routes.py && \
 | 
			
		||||
  git config --global --add safe.directory '*'
 | 
			
		||||
 | 
			
		||||
WORKDIR ${ROOT}
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,10 @@ set -Eeuo pipefail
 | 
			
		||||
# TODO: move all mkdir -p ?
 | 
			
		||||
mkdir -p /data/config/auto/scripts/
 | 
			
		||||
# mount scripts individually
 | 
			
		||||
 | 
			
		||||
echo $ROOT
 | 
			
		||||
ls -lha $ROOT
 | 
			
		||||
 | 
			
		||||
find "${ROOT}/scripts/" -maxdepth 1 -type l -delete
 | 
			
		||||
cp -vrfTs /data/config/auto/scripts/ "${ROOT}/scripts/"
 | 
			
		||||
 | 
			
		||||
@@ -20,6 +24,8 @@ if [ ! -f /data/config/auto/styles.csv ]; then
 | 
			
		||||
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/
 | 
			
		||||
 | 
			
		||||
@@ -57,9 +63,16 @@ chown -R root ~/.cache/
 | 
			
		||||
chmod 766 ~/.cache/
 | 
			
		||||
 | 
			
		||||
shopt -s nullglob
 | 
			
		||||
list=(./extensions/*/requirements.txt)
 | 
			
		||||
for req in "${list[@]}"; do
 | 
			
		||||
  pip install -r "$req"
 | 
			
		||||
# 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
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
)
 | 
			
		||||
@@ -1,42 +1,73 @@
 | 
			
		||||
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'
 | 
			
		||||
# Limited system user UID
 | 
			
		||||
ARG USE_UID=991
 | 
			
		||||
# Limited system user GID
 | 
			
		||||
ARG USE_GID=991
 | 
			
		||||
# Latest tag or bleeding edge commit
 | 
			
		||||
ARG USE_EDGE=false
 | 
			
		||||
# ComfyUI-GGUF support
 | 
			
		||||
ARG USE_GGUF=false
 | 
			
		||||
# x-flux-comfyui support
 | 
			
		||||
ARG USE_XFLUX=false
 | 
			
		||||
# comfyui_controlnet_aux support
 | 
			
		||||
ARG USE_CNAUX=false
 | 
			
		||||
 | 
			
		||||
FROM pytorch/pytorch:2.0.1-cuda11.7-cudnn8-runtime
 | 
			
		||||
FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime
 | 
			
		||||
 | 
			
		||||
ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 | 
			
		||||
# Use args
 | 
			
		||||
ARG USE_UID
 | 
			
		||||
ARG USE_GID
 | 
			
		||||
ARG USE_EDGE
 | 
			
		||||
ARG USE_GGUF
 | 
			
		||||
ARG USE_XFLUX
 | 
			
		||||
ARG USE_CNAUX
 | 
			
		||||
 | 
			
		||||
RUN apt-get update && apt-get install -y git && apt-get clean
 | 
			
		||||
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/app/.cache USE_CNAUX=$USE_CNAUX
 | 
			
		||||
 | 
			
		||||
ENV ROOT=/stable-diffusion
 | 
			
		||||
RUN --mount=type=cache,target=/root/.cache/pip \
 | 
			
		||||
# User/Group
 | 
			
		||||
RUN groupadd -r app -g ${USE_GID} && useradd --no-log-init -m -r -g app app -u ${USE_UID} && \
 | 
			
		||||
  mkdir -p ${ROOT} && chown ${USE_UID}:${USE_GID} ${ROOT} && mkdir -p ${CACHE}/pip && chown -R ${USE_UID}:${USE_GID} ${CACHE}
 | 
			
		||||
RUN --mount=type=cache,uid=${USE_UID},gid=${USE_GID},target=${CACHE} chown -R ${USE_UID}:${USE_UID} ${CACHE}
 | 
			
		||||
 | 
			
		||||
RUN apt-get update && apt-get install -y git && ([ "${USE_XFLUX}" = "true" ] && apt-get install -y libgl1-mesa-glx python3-opencv) && apt-get clean
 | 
			
		||||
 | 
			
		||||
USER app:app
 | 
			
		||||
ENV PATH="${PATH}:/home/app/.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 && \
 | 
			
		||||
  git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \
 | 
			
		||||
  pip install -r requirements.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
 | 
			
		||||
 | 
			
		||||
  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_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" ]; 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
 | 
			
		||||
 | 
			
		||||
WORKDIR ${ROOT}
 | 
			
		||||
COPY --chown=${USE_UID}:${USE_GID} . /docker/
 | 
			
		||||
RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml ${ROOT}
 | 
			
		||||
 | 
			
		||||
ARG BRANCH=master SHA=8607c2d42d10b0108de02528e813cc703e58813f
 | 
			
		||||
RUN --mount=type=cache,target=/root/.cache/pip \
 | 
			
		||||
  git fetch && \
 | 
			
		||||
  git checkout ${BRANCH} && \
 | 
			
		||||
  git reset --hard ${SHA} && \
 | 
			
		||||
  pip install -r requirements.txt
 | 
			
		||||
 | 
			
		||||
# add info
 | 
			
		||||
COPY . /docker/
 | 
			
		||||
RUN cp /docker/extra_model_paths.yaml ${ROOT}
 | 
			
		||||
 | 
			
		||||
ENV NVIDIA_VISIBLE_DEVICES=all
 | 
			
		||||
ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
 | 
			
		||||
ENV NVIDIA_VISIBLE_DEVICES=all PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
 | 
			
		||||
EXPOSE 7860
 | 
			
		||||
ENTRYPOINT ["/docker/entrypoint.sh"]
 | 
			
		||||
CMD python -u main.py --listen --port 7860 ${CLI_ARGS}
 | 
			
		||||
 
 | 
			
		||||
@@ -2,11 +2,12 @@
 | 
			
		||||
 | 
			
		||||
set -Eeuo pipefail
 | 
			
		||||
 | 
			
		||||
mkdir -vp /data/config/comfy/custom_nodes
 | 
			
		||||
CUSTOM_NODES="/data/config/comfy/custom_nodes"
 | 
			
		||||
mkdir -vp "${CUSTOM_NODES}"
 | 
			
		||||
 | 
			
		||||
declare -A MOUNTS
 | 
			
		||||
 | 
			
		||||
MOUNTS["/root/.cache"]="/data/.cache"
 | 
			
		||||
MOUNTS["${CACHE}"]="/data/.cache"
 | 
			
		||||
MOUNTS["${ROOT}/input"]="/data/config/comfy/input"
 | 
			
		||||
MOUNTS["${ROOT}/output"]="/output/comfy"
 | 
			
		||||
 | 
			
		||||
@@ -22,4 +23,31 @@ for to_path in "${!MOUNTS[@]}"; do
 | 
			
		||||
  echo Mounted $(basename "${from_path}")
 | 
			
		||||
done
 | 
			
		||||
 | 
			
		||||
if [ "${USE_GGUF}" = "true" ]; then
 | 
			
		||||
  [ ! -e "${CUSTOM_NODES}/ComfyUI-GGUF" ] && mv "${ROOT}/ComfyUI-GGUF" "${CUSTOM_NODES}"/
 | 
			
		||||
fi
 | 
			
		||||
if [ "${USE_XFLUX}" = "true" ]; then
 | 
			
		||||
  [ ! -e "${CUSTOM_NODES}/x-flux-comfyui" ] && mv "${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 && \
 | 
			
		||||
    python -c 'import sys; from urllib.request import urlopen; from pathlib import Path; Path(sys.argv[2]).write_bytes(urlopen("".join([sys.argv[1],sys.argv[2]])).read())' \
 | 
			
		||||
    "https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/" "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 && \
 | 
			
		||||
    python -c 'import sys; from urllib.request import urlopen; from pathlib import Path; Path(sys.argv[2]).write_bytes(urlopen("".join([sys.argv[1],sys.argv[2]])).read())' \
 | 
			
		||||
    "https://huggingface.co/XLabs-AI/flux-ip-adapter/resolve/main/" "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" ]; then
 | 
			
		||||
  [ ! -e "${CUSTOM_NODES}/comfyui_controlnet_aux" ] && mv "${ROOT}/comfyui_controlnet_aux" "${CUSTOM_NODES}"/
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
if [ -f "/data/config/comfy/startup.sh" ]; then
 | 
			
		||||
  pushd ${ROOT}
 | 
			
		||||
  . /data/config/comfy/startup.sh
 | 
			
		||||
  popd
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
exec "$@"
 | 
			
		||||
 
 | 
			
		||||
@@ -15,11 +15,13 @@ a111:
 | 
			
		||||
  gligen: models/GLIGEN
 | 
			
		||||
  clip: models/CLIPEncoder
 | 
			
		||||
  embeddings: embeddings
 | 
			
		||||
  unet: models/unet
 | 
			
		||||
  clip_vision: models/clip_vision
 | 
			
		||||
  xlabs: models/xlabs
 | 
			
		||||
 | 
			
		||||
  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
 | 
			
		||||
  # clip_vision: config/comfy/clip_vision
 | 
			
		||||
  # diffusers: config/comfy/diffusers
 | 
			
		||||
 
 | 
			
		||||
@@ -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"]
 | 
			
		||||
 
 | 
			
		||||
@@ -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}
 | 
			
		||||
 | 
			
		||||
@@ -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 "$@"
 | 
			
		||||
		Reference in New Issue
	
	Block a user