diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index db5d840..5c06abb 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,12 +12,66 @@ jobs: build: strategy: matrix: - profile: - - auto - - comfy - - download + include: + - image: simonmcnair/AUTOMATIC1111 + dockerfile: services/AUTOMATIC1111/Dockerfile + context: services/AUTOMATIC1111/ + + # - image: simonmcnair/AUTOMATIC1111-rocm + # dockerfile: services/AUTOMATIC1111/Dockerfile.rocm + # context: services/AUTOMATIC1111/ + + - image: simonmcnair/comfy + dockerfile: services/comfy/Dockerfile + context: services/comfy/ + + - image: simonmcnair/download + dockerfile: services/download/Dockerfile + context: services/download/ + + - image: simonmcnair/fooocus + dockerfile: services/fooocus/Dockerfile + context: services/fooocus/ + + - image: simonmcnair/forge + dockerfile: services/forge/Dockerfile + context: services/forge/ + + - image: simonmcnair/reforge + dockerfile: services/reforge/Dockerfile + context: services/reforge/ + runs-on: ubuntu-latest name: ${{ matrix.profile }} steps: - - uses: actions/checkout@v3 - - run: docker compose --profile ${{ matrix.profile }} build --progress plain + # - uses: actions/checkout@v3 + # - run: docker compose --profile ${{ matrix.profile }} build --progress plain + + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ matrix.image }} + - name: Build and push Docker image + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: ${{ matrix.context }} + file: ${{ matrix.dockerfile }} + push: true + #This is needed because it is called main instead of master to get the latest tag in docker + # tags: | + # set latest tag for default branch + # type=raw,value=latest,enable={{is_default_branch}} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/Docker-compose-build.yml b/Docker-compose-build.yml new file mode 100644 index 0000000..83073ea --- /dev/null +++ b/Docker-compose-build.yml @@ -0,0 +1,88 @@ +x-base_service: &base_service + ports: + - "${WEBUI_PORT:-7860}:7860" + volumes: + - &v1 ./data:/data + - &v2 ./output:/output + stop_signal: SIGKILL + tty: true + deploy: + resources: + reservations: + devices: + - driver: nvidia + device_ids: ['0'] + capabilities: [compute, utility] +name: webui-docker +services: + download: + build: ./services/download/ + profiles: ["download"] + volumes: + - *v1 + auto: &automatic + <<: *base_service + profiles: ["auto"] + build: ./services/AUTOMATIC1111 + image: sd-auto:80 + environment: + - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api + + auto-rocm: + <<: *base_service + profiles: ["auto-rocm"] + build: + context: ./services/AUTOMATIC1111 + dockerfile: Dockerfile.rocm + devices: + - "/dev/kfd" + - "/dev/dri" + deploy: {} + environment: + - CLI_ARGS=--allow-code --medvram --enable-insecure-extension-access --api + + reforge: &reforge + <<: *base_service + profiles: ["reforge"] + build: ./services/reforge + image: sd-reforge:80 + environment: + - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api --pin-shared-memory --cuda-malloc --cuda-stream + + forge: &forge + <<: *base_service + profiles: ["forge"] + build: ./services/forge + image: sd-forge:80 + environment: + - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api --pin-shared-memory --cuda-malloc --cuda-stream + + auto-cpu: + <<: *automatic + profiles: ["auto-cpu"] + deploy: {} + environment: + - CLI_ARGS=--no-half --precision full --allow-code --enable-insecure-extension-access --api + + comfy: &comfy + <<: *base_service + profiles: ["comfy"] + build: ./services/comfy/ + image: sd-comfy:6 + environment: + - CLI_ARGS= + + comfy-cpu: + <<: *comfy + profiles: ["comfy-cpu"] + deploy: {} + environment: + - CLI_ARGS=--cpu + + fooocus: &fooocus + <<: *base_service + profiles: ["fooocus"] + build: ./services/fooocus/ + image: sd-fooocus:3 + environment: + - CLI_ARGS= diff --git a/README.md b/README.md index 071a459..c973e68 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,14 @@ +I have forked this as AbdBarho hasn't been around for a while. I'm not great with git, Linux , docker or stable diffusion but I manage to get along a bit. Slowly. with more commits than it takes. + +I am happy to look at PR's as and when. Also happy to pass this back, as and whe, and if, they return. + +supports: +- AUTOMATIC1111 +- comfy +- fooocus +- forge +- reforge + # Stable Diffusion WebUI Docker Run Stable Diffusion on your machine with a nice UI without any hassle! @@ -26,6 +37,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)** diff --git a/docker-compose.yml b/docker-compose.yml index 3456818..712a6fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,6 +41,39 @@ services: environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api +# TODO check docker image +# auto-rocm: +# <<: *base_service +# profiles: ["auto-rocm"] +# image: simonmcnair/automatic1111-rocm:master +# devices: +# - "/dev/kfd" +# - "/dev/dri" +# deploy: {} +# environment: +# - CLI_ARGS=--allow-code --medvram --enable-insecure-extension-access --api +# +# reforge: &reforge +# <<: *base_service +# profiles: ["reforge"] +# image: simonmcnair/reforge:master +# environment: +# - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api --pin-shared-memory --cuda-malloc --cuda-stream +# +# forge: &forge +# <<: *base_service +# profiles: ["forge"] +# image: simonmcnair/forge:master +# environment: +# - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api --pin-shared-memory --cuda-malloc --cuda-stream +# +# fooocus: &fooocus +# <<: *base_service +# profiles: ["fooocus"] +# image: simonmcnair/fooocus:master +# environment: +# - CLI_ARGS= + auto-cpu: <<: *auto_service profiles: ["auto-cpu"] diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index b8e5751..90bde70 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -21,9 +21,11 @@ ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 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 \ + 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 + ffmpeg libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 libcairo2-dev build-essential libgoogle-perftools-dev && \ + apt-get clean WORKDIR / RUN --mount=type=cache,target=/root/.cache/pip \ @@ -44,8 +46,6 @@ RUN --mount=type=cache,target=/root/.cache/pip \ 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 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 diff --git a/services/AUTOMATIC1111/Dockerfile.rocm b/services/AUTOMATIC1111/Dockerfile.rocm new file mode 100644 index 0000000..b463fa2 --- /dev/null +++ b/services/AUTOMATIC1111/Dockerfile.rocm @@ -0,0 +1,74 @@ +FROM alpine/git:2.36.2 as download + +COPY clone.sh /clone.sh + +RUN rm -rf "/usr/local/share/boost" +RUN rm -rf "$AGENT_TOOLSDIRECTORY" + +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 rocm/pytorch:rocm6.0.2_ubuntu22.04_py3.10_pytorch_2.1.2 + +ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 + +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 libgoogle-perftools-dev && \ + apt-get clean + + +RUN python -m pip install --upgrade pip wheel + +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 && \ + pip install -r requirements_versions.txt + + +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==0.0.23.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 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 \ + # 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/envs/py_3.10/lib/python3.10/site-packages/gradio/routes.py && \ + git config --global --add safe.directory '*' + +WORKDIR ${ROOT} +ENV CLI_ARGS="" +EXPOSE 7860 +ENTRYPOINT ["/docker/entrypoint.sh"] +CMD python -u webui.py --listen --port 7860 ${CLI_ARGS} diff --git a/services/AUTOMATIC1111/clone.sh b/services/AUTOMATIC1111/clone.sh index cfdf0a2..2c37c41 100644 --- a/services/AUTOMATIC1111/clone.sh +++ b/services/AUTOMATIC1111/clone.sh @@ -8,4 +8,4 @@ git init git remote add origin "$2" git fetch origin "$3" --depth=1 git reset --hard "$3" -rm -rf .git +rm -rf .git \ No newline at end of file diff --git a/services/AUTOMATIC1111/entrypoint.sh b/services/AUTOMATIC1111/entrypoint.sh index 968d52c..5143c1b 100755 --- a/services/AUTOMATIC1111/entrypoint.sh +++ b/services/AUTOMATIC1111/entrypoint.sh @@ -26,12 +26,13 @@ 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/ +rsync --info=NAME ${ROOT}/models/VAE-approx/ /data/models/VAE-approx/ +rsync --info=NAME ${ROOT}/models/karlo/ /data/models/karlo/ declare -A MOUNTS -MOUNTS["/root/.cache"]="/data/.cache" +#MOUNTS["/root/.cache"]="/data/.cache" +MOUNTS["${USER_HOME}/.cache"]="/data/.cache" MOUNTS["${ROOT}/models"]="/data/models" MOUNTS["${ROOT}/embeddings"]="/data/embeddings" @@ -59,10 +60,12 @@ done echo "Installing extension dependencies (if any)" -# because we build our container as root: -chown -R root ~/.cache/ +chown -R $PUID:$PGID ~/.cache/ chmod 766 ~/.cache/ +chown -R $PUID:$PGID /output +chmod 766 /output + shopt -s nullglob # For install.py, please refer to https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Developing-extensions#installpy list=(./extensions/*/install.py) diff --git a/services/download/Dockerfile b/services/download/Dockerfile index a95ad03..78c11ee 100644 --- a/services/download/Dockerfile +++ b/services/download/Dockerfile @@ -1,6 +1,12 @@ FROM bash:alpine3.19 +ARG PUID=0 +ARG PGID=0 +# set build args as container environment variables for entrypoint reference +ENV PUID=$PUID +ENV PGID=$PGID + RUN apk update && apk add parallel aria2 -COPY . /docker +COPY --chown=$PUID:$PGID . /docker RUN chmod +x /docker/download.sh ENTRYPOINT ["/docker/download.sh"] diff --git a/services/fooocus/Dockerfile b/services/fooocus/Dockerfile new file mode 100644 index 0000000..08b9b5f --- /dev/null +++ b/services/fooocus/Dockerfile @@ -0,0 +1,85 @@ +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 libglib2.0-0 libgl1-mesa-glx python-dev libgoogle-perftools-dev && apt-get clean + +ARG PUID=0 +ARG PGID=0 +ARG USER_HOME=/root +# set build args as container environment variables for entrypoint reference +ENV PUID=$PUID +ENV PGID=$PGID +ENV USER_HOME=$USER_HOME + +# if user home does not exist, create it +RUN mkdir -p "$USER_HOME" + +# home already exists, chown it +RUN chown -R "${PUID}:${PGID}" "$USER_HOME" + +# Only groupadd if we're non root +RUN if [ "$PGID" -ne "0" ]; then \ + echo non root group detected; \ + groupadd \ + --gid "$PGID" \ + stablediffusion ;\ + else \ + echo "root group detected" ; \ + fi + +# Only useradd if we're non root +RUN if [ "$PUID" -ne "0" ]; then \ + echo non root user detected; \ + useradd \ + --gid="$PGID" \ + --no-user-group \ + -M \ + --home "$USER_HOME" \ + stablediffusion ; \ + else \ + echo "root group detected" ; \ + fi + +# set this to your target branch commit +ARG BRANCH=main SHA=e2f9bcb11d06216d6800676c48d8d74d6fd77a4b + +ENV ROOT=/stable-diffusion + + +# drop permissions (if build targets non root) +USER $PUID:$PGID + +RUN --mount=type=cache,target=${USER_HOME}/.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 chown -R "$PUID:$PGID" "${ROOT}" + +RUN --mount=type=cache,target=${USER_HOME}/.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=${USER_HOME}/.cache/pip \ + git fetch && \ + git checkout ${BRANCH} && \ + git reset --hard ${SHA} && \ + pip install -r requirements_versions.txt + +# add info +COPY --chown=$PUID:$PGID . /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} diff --git a/services/fooocus/config.txt b/services/fooocus/config.txt new file mode 100644 index 0000000..ddced71 --- /dev/null +++ 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" +} \ No newline at end of file diff --git a/services/fooocus/entrypoint.sh b/services/fooocus/entrypoint.sh new file mode 100644 index 0000000..cc0fa75 --- /dev/null +++ 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 "$@" diff --git a/services/forge/Dockerfile b/services/forge/Dockerfile new file mode 100644 index 0000000..2f20389 --- /dev/null +++ b/services/forge/Dockerfile @@ -0,0 +1,127 @@ +FROM alpine/git:2.36.2 AS download + +COPY clone.sh /clone.sh + +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.git 6f7db241d2f8ba7457bac5ca9753331f0c266917 +RUN . /clone.sh huggingface_guess https://github.com/lllyasviel/huggingface_guess.git 70942022b6bcd17d941c1b4172804175758618e2 + + +FROM pytorch/pytorch:2.3.1-cuda12.1-cudnn8-runtime + +ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 + +RUN --mount=type=cache,target=/root/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 libgoogle-perftools-dev && \ + apt-get clean + +ARG PUID=0 +ARG PGID=0 +ARG USER_HOME=/root +# set build args as container environment variables for entrypoint reference +ENV PUID=$PUID +ENV PGID=$PGID +ENV USER_HOME=$USER_HOME + +# if user home does not exist, create it +RUN mkdir -p "$USER_HOME" + +# home already exists, chown it +RUN chown -R "${PUID}:${PGID}" "$USER_HOME" + +# Only groupadd if we're non root +RUN if [ "$PGID" -ne "0" ]; then \ + echo non root group detected; \ + groupadd \ + --gid "$PGID" \ + stablediffusion ;\ + else \ + echo "root group detected" ; \ + fi + +# Only useradd if we're non root +RUN if [ "$PUID" -ne "0" ]; then \ + echo non root user detected; \ + useradd \ + --gid="$PGID" \ + --no-user-group \ + -M \ + --home "$USER_HOME" \ + stablediffusion ; \ + else \ + echo "root group detected" ; \ + fi + +ENV ROOT=/stable-diffusion-webui-forge + +WORKDIR / +RUN --mount=type=cache,target=/root/.cache/forge-repo \ + git clone https://github.com/lllyasviel/stable-diffusion-webui-forge.git && \ + cd stable-diffusion-webui-forge && \ + sed -i '/torch/d' requirements_versions.txt && \ + pip install -r requirements_versions.txt + +RUN if [ -d "/opt/conda/lib/python3.10" ]; then \ + echo Python 3.10 detected; \ + sed -i 's/in_app_dir = .*/in_app_dir = True/g' /opt/conda/lib/python3.10/site-packages/gradio/routes.py ;\ + elif [ -d "/opt/conda/lib/python3.11" ]; then \ + echo Python 3.11 detected; \ + sed -i 's/in_app_dir = .*/in_app_dir = True/g' /opt/conda/lib/python3.11/site-packages/gradio/routes.py ;\ + fi && \ + # mv ${ROOT}/style.css ${ROOT}/user.css && \ + # one of the ugliest hacks I ever wrote \ + # updated from 3.10.to 3.11 + git config --global --add safe.directory '*' + + + +# drop permissions (if build targets non root) +USER $PUID:$PGID + + +COPY --from=download --chown=${PUID}:${PGID} /repositories/ ${ROOT}/repositories/ +RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/clip_interrogator/data/* ${ROOT}/interrogate +RUN --mount=type=cache,target=/root/.cache/codeformer pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt + +# Clone and copy huggingface_guess module +#RUN git clone https://github.com/lllyasviel/huggingface_guess.git /tmp/huggingface_guess && \ +# cp -r /tmp/huggingface_guess/huggingface_guess ${ROOT}/huggingface_guess + +# Ensure torchvision is correctly installed +RUN --mount=type=cache,target=/root/.cache/torch pip install torchvision==0.18.1 + +RUN --mount=type=cache,target=/root/.cache/repos \ + pip install pyngrok xformers==0.0.27 pytorch_lightning torchdiffeq torchsde \ + 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 enough) that is fixed by this version of malloc +# maybe move this up to the dependencies list. + +ENV LD_PRELOAD=libtcmalloc.so + +COPY . /docker + +RUN chown -R "$PUID:$PGID" "${ROOT}" +RUN chown -R "$PUID:$PGID" /docker + + +WORKDIR ${ROOT} +ENV NVIDIA_VISIBLE_DEVICES=all +ENV CLI_ARGS="" +EXPOSE 7860 +ENTRYPOINT ["/docker/entrypoint.sh"] +CMD python -u webui.py --listen --port 7860 ${CLI_ARGS} diff --git a/services/forge/clone.sh b/services/forge/clone.sh new file mode 100644 index 0000000..2c37c41 --- /dev/null +++ b/services/forge/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 \ No newline at end of file diff --git a/services/forge/config.py b/services/forge/config.py new file mode 100644 index 0000000..7ab28d7 --- /dev/null +++ b/services/forge/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/forge/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) + diff --git a/services/forge/entrypoint.sh b/services/forge/entrypoint.sh new file mode 100755 index 0000000..110ed98 --- /dev/null +++ b/services/forge/entrypoint.sh @@ -0,0 +1,86 @@ +#!/bin/bash + +set -Eeuo pipefail + +# TODO: move all mkdir -p ? +mkdir -p /data/config/forge/scripts/ +# mount scripts individually + +echo $ROOT +ls -lha $ROOT + +find "${ROOT}/scripts/" -maxdepth 1 -type l -delete +cp -vrfTs /data/config/forge/scripts/ "${ROOT}/scripts/" + +# Set up config file +python /docker/config.py /data/config/forge/config.json + +if [ ! -f /data/config/forge/ui-config.json ]; then + echo '{}' >/data/config/forge/ui-config.json +fi + +if [ ! -f /data/config/forge/styles.csv ]; then + touch /data/config/forge/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["${USER_HOME}/.cache"]="/data/.cache" +MOUNTS["${ROOT}/models"]="/data/models" + +MOUNTS["${ROOT}/embeddings"]="/data/embeddings" +MOUNTS["${ROOT}/config.json"]="/data/config/forge/config.json" +MOUNTS["${ROOT}/ui-config.json"]="/data/config/forge/ui-config.json" +MOUNTS["${ROOT}/styles.csv"]="/data/config/forge/styles.csv" +MOUNTS["${ROOT}/extensions"]="/data/config/forge/extensions" +MOUNTS["${ROOT}/config_states"]="/data/config/forge/config_states" + +# extra hacks +MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache" + +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 + +chown -R $PUID:$PGID ~/.cache/ +chmod 766 ~/.cache/ +chown -R $PUID:$PGID /output +chmod 766 /output + +echo "Installing extension dependencies (if any)" + +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/forge/startup.sh" ]; then + pushd ${ROOT} + echo "Running startup script" + . /data/config/forge/startup.sh + popd +fi + +exec "$@" diff --git a/services/reforge/Dockerfile b/services/reforge/Dockerfile new file mode 100644 index 0000000..1e625db --- /dev/null +++ b/services/reforge/Dockerfile @@ -0,0 +1,84 @@ +FROM alpine/git:2.36.2 AS download + +COPY clone.sh /clone.sh + +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.git 6f7db241d2f8ba7457bac5ca9753331f0c266917 + + +FROM pytorch/pytorch:2.3.1-cuda12.1-cudnn8-runtime + +ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 + +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 + + +WORKDIR / +RUN --mount=type=cache,target=/root/.cache/pip \ + git clone https://github.com/Panchovix/stable-diffusion-webui-reForge.git /stable-diffusion-webui-reforge && \ + cd stable-diffusion-webui-reforge && \ + sed -i '/torch/d' requirements_versions.txt && \ + pip install -r requirements_versions.txt + +ENV ROOT=/stable-diffusion-webui-reforge + +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 + +# Clone and copy huggingface_guess module +RUN git clone https://github.com/lllyasviel/huggingface_guess.git /tmp/huggingface_guess && \ + cp -r /tmp/huggingface_guess/huggingface_guess ${ROOT}/huggingface_guess + +# Ensure torchvision is correctly installed +RUN --mount=type=cache,target=/root/.cache/pip \ + pip install torchvision==0.18.1 + +RUN --mount=type=cache,target=/root/.cache/pip \ + pip install pyngrok xformers==0.0.27 pytorch_lightning==1.6.5 torchdiffeq torchsde \ + 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 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 pip install pydantic==1.10.21 + +RUN if [ -d "/opt/conda/lib/python3.10" ]; then \ + echo Python 3.10 detected; \ + sed -i 's/in_app_dir = .*/in_app_dir = True/g' /opt/conda/lib/python3.10/site-packages/gradio/routes.py ;\ + elif [ -d "/opt/conda/lib/python3.11" ]; then \ + echo Python 3.11 detected; \ + sed -i 's/in_app_dir = .*/in_app_dir = True/g' /opt/conda/lib/python3.11/site-packages/gradio/routes.py ;\ + fi && \ + # mv ${ROOT}/style.css ${ROOT}/user.css && \ + # one of the ugliest hacks I ever wrote \ + # updated from 3.10.to 3.11 + git config --global --add safe.directory '*' + + + +WORKDIR ${ROOT} +ENV NVIDIA_VISIBLE_DEVICES=all +ENV CLI_ARGS="" +EXPOSE 7860 +ENTRYPOINT ["/docker/entrypoint.sh"] +CMD python -u webui.py --listen --port 7860 ${CLI_ARGS} diff --git a/services/reforge/clone.sh b/services/reforge/clone.sh new file mode 100644 index 0000000..2c37c41 --- /dev/null +++ b/services/reforge/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 \ No newline at end of file diff --git a/services/reforge/config.py b/services/reforge/config.py new file mode 100644 index 0000000..7db2f54 --- /dev/null +++ b/services/reforge/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/reforge/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) + diff --git a/services/reforge/entrypoint.sh b/services/reforge/entrypoint.sh new file mode 100755 index 0000000..1ef5400 --- /dev/null +++ b/services/reforge/entrypoint.sh @@ -0,0 +1,85 @@ +#!/bin/bash + +set -Eeuo pipefail + +# TODO: move all mkdir -p ? +mkdir -p /data/config/reforge/scripts/ +# mount scripts individually + +echo $ROOT +ls -lha $ROOT + +find "${ROOT}/scripts/" -maxdepth 1 -type l -delete +cp -vrfTs /data/config/reforge/scripts/ "${ROOT}/scripts/" + +# Set up config file +python /docker/config.py /data/config/reforge/config.json + +if [ ! -f /data/config/reforge/ui-config.json ]; then + echo '{}' >/data/config/reforge/ui-config.json +fi + +if [ ! -f /data/config/reforge/styles.csv ]; then + touch /data/config/reforge/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" +MOUNTS["${ROOT}/models"]="/data/models" + +MOUNTS["${ROOT}/embeddings"]="/data/embeddings" +MOUNTS["${ROOT}/config.json"]="/data/config/reforge/config.json" +MOUNTS["${ROOT}/ui-config.json"]="/data/config/reforge/ui-config.json" +MOUNTS["${ROOT}/styles.csv"]="/data/config/reforge/styles.csv" +MOUNTS["${ROOT}/extensions"]="/data/config/reforge/extensions" +MOUNTS["${ROOT}/config_states"]="/data/config/reforge/config_states" + +# extra hacks +MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache" + +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 + +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/reforge/startup.sh" ]; then + pushd ${ROOT} + echo "Running startup script" + . /data/config/reforge/startup.sh + popd +fi + +exec "$@"