mirror of
https://github.com/AbdBarho/stable-diffusion-webui-docker.git
synced 2024-08-17 14:30:27 +03:00
Merge branch 'adding_fooocus' of github.com:digitallamb/stable-diffusion-webui-docker into adding_fooocus
This commit is contained in:
commit
89e258d20d
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/
|
||||
|
@ -29,7 +29,7 @@ services:
|
||||
<<: *base_service
|
||||
profiles: ["auto"]
|
||||
build: ./services/AUTOMATIC1111
|
||||
image: sd-auto:67
|
||||
image: sd-auto:71
|
||||
environment:
|
||||
- CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
|
||||
|
||||
@ -60,7 +60,7 @@ services:
|
||||
<<: *base_service
|
||||
profiles: ["comfy"]
|
||||
build: ./services/comfy/
|
||||
image: sd-comfy:5
|
||||
image: sd-comfy:6
|
||||
environment:
|
||||
- CLI_ARGS=
|
||||
|
||||
|
@ -15,12 +15,7 @@ RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interr
|
||||
RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f
|
||||
|
||||
|
||||
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.1.2-cuda12.1-cudnn8-runtime
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
|
||||
|
||||
@ -32,58 +27,38 @@ RUN --mount=type=cache,target=/var/cache/apt \
|
||||
ffmpeg libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 libcairo2-dev build-essential
|
||||
|
||||
|
||||
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
|
||||
|
||||
|
||||
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 5ef669de080814067961f28357256e8fe27544f4 && \
|
||||
git reset --hard cf2772fab0af5573da775e7437e6acdca424f26e && \
|
||||
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/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 \
|
||||
pip install pyngrok xformers \
|
||||
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 eno8ugh) 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=5ef669de080814067961f28357256e8fe27544f4
|
||||
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/"
|
||||
|
||||
@ -62,9 +66,9 @@ 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`
|
||||
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
|
||||
if $(jq -e ".disabled_extensions|any(. == \"$EXTNAME\")" config.json); then
|
||||
echo "Skipping disabled extension ($EXTNAME)"
|
||||
continue
|
||||
fi
|
||||
|
@ -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,8 +1,4 @@
|
||||
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
|
||||
FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
|
||||
|
||||
@ -13,32 +9,14 @@ RUN --mount=type=cache,target=/root/.cache/pip \
|
||||
git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \
|
||||
cd ${ROOT} && \
|
||||
git checkout master && \
|
||||
git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \
|
||||
git reset --hard d1f3637a5a944d0607b899babd8ff11d87100503 && \
|
||||
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
|
||||
|
||||
|
||||
WORKDIR ${ROOT}
|
||||
|
||||
ARG BRANCH=master SHA=7e941f9f247f9b013a33c2e7d117466108414e99
|
||||
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}
|
||||
RUN chmod u+x /docker/entrypoint.sh
|
||||
RUN cp /docker/extra_model_paths.yaml ${ROOT}
|
||||
RUN chmod u+x /docker/entrypoint.sh && 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}
|
||||
|
Loading…
Reference in New Issue
Block a user