mirror of
https://github.com/AbdBarho/stable-diffusion-webui-docker.git
synced 2024-09-11 18:47:07 +03:00
Merge branch 'master' into adding_fooocus
This commit is contained in:
commit
4f0e684247
@ -29,7 +29,7 @@ services:
|
|||||||
<<: *base_service
|
<<: *base_service
|
||||||
profiles: ["auto"]
|
profiles: ["auto"]
|
||||||
build: ./services/AUTOMATIC1111
|
build: ./services/AUTOMATIC1111
|
||||||
image: sd-auto:68
|
image: sd-auto:71
|
||||||
environment:
|
environment:
|
||||||
- CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
|
- CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
|
||||||
|
|
||||||
@ -60,7 +60,7 @@ services:
|
|||||||
<<: *base_service
|
<<: *base_service
|
||||||
profiles: ["comfy"]
|
profiles: ["comfy"]
|
||||||
build: ./services/comfy/
|
build: ./services/comfy/
|
||||||
image: sd-comfy:5
|
image: sd-comfy:6
|
||||||
environment:
|
environment:
|
||||||
- CLI_ARGS=
|
- CLI_ARGS=
|
||||||
|
|
||||||
|
@ -15,7 +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
|
RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f
|
||||||
|
|
||||||
|
|
||||||
FROM pytorch/pytorch:2.1.0-cuda12.1-cudnn8-runtime
|
FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
|
ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
|
||||||
|
|
||||||
@ -31,7 +31,7 @@ WORKDIR /
|
|||||||
RUN --mount=type=cache,target=/root/.cache/pip \
|
RUN --mount=type=cache,target=/root/.cache/pip \
|
||||||
git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \
|
git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \
|
||||||
cd stable-diffusion-webui && \
|
cd stable-diffusion-webui && \
|
||||||
git reset --hard 4afaaf8a020c1df457bcf7250cb1c7f609699fa7 && \
|
git reset --hard cf2772fab0af5573da775e7437e6acdca424f26e && \
|
||||||
pip install -r requirements_versions.txt
|
pip install -r requirements_versions.txt
|
||||||
|
|
||||||
|
|
||||||
@ -46,8 +46,12 @@ RUN --mount=type=cache,target=/root/.cache/pip \
|
|||||||
pip install pyngrok xformers \
|
pip install pyngrok xformers \
|
||||||
git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
|
git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
|
||||||
git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
|
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
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
COPY . /docker
|
COPY . /docker
|
||||||
|
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
FROM alpine:3.17 as xformers
|
FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime
|
||||||
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
|
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} && \
|
git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \
|
||||||
cd ${ROOT} && \
|
cd ${ROOT} && \
|
||||||
git checkout master && \
|
git checkout master && \
|
||||||
git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \
|
git reset --hard d1f3637a5a944d0607b899babd8ff11d87100503 && \
|
||||||
pip install -r requirements.txt
|
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}
|
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/
|
COPY . /docker/
|
||||||
RUN cp /docker/extra_model_paths.yaml ${ROOT}
|
RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml ${ROOT}
|
||||||
RUN chmod u+x /docker/entrypoint.sh
|
|
||||||
RUN cp /docker/extra_model_paths.yaml ${ROOT}
|
|
||||||
|
|
||||||
ENV NVIDIA_VISIBLE_DEVICES=all
|
ENV NVIDIA_VISIBLE_DEVICES=all PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
|
||||||
ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
|
|
||||||
EXPOSE 7860
|
EXPOSE 7860
|
||||||
ENTRYPOINT ["/docker/entrypoint.sh"]
|
ENTRYPOINT ["/docker/entrypoint.sh"]
|
||||||
CMD python -u main.py --listen --port 7860 ${CLI_ARGS}
|
CMD python -u main.py --listen --port 7860 ${CLI_ARGS}
|
||||||
|
Loading…
Reference in New Issue
Block a user