mirror of
https://github.com/AbdBarho/stable-diffusion-webui-docker.git
synced 2026-03-06 05:13:58 +01:00
Fix Final
I forgot that I merged the main files so those would show up in the edits. This should have fixed that
This commit is contained in:
parent
54a2da55a2
commit
f4aae9e925
|
|
@ -67,7 +67,7 @@ services:
|
||||||
<<: *base_service
|
<<: *base_service
|
||||||
profiles: ["comfy"]
|
profiles: ["comfy"]
|
||||||
build: ./services/comfy/
|
build: ./services/comfy/
|
||||||
image: sd-comfy:1
|
image: sd-comfy:6
|
||||||
volumes:
|
volumes:
|
||||||
- *v2
|
- *v2
|
||||||
environment:
|
environment:
|
||||||
|
|
|
||||||
|
|
@ -1,34 +1,35 @@
|
||||||
# syntax=docker/dockerfile:1
|
|
||||||
|
|
||||||
FROM python:3.10.9-slim
|
FROM python:3.10.9-slim
|
||||||
|
|
||||||
SHELL ["/bin/bash", "-ceuxo", "pipefail"]
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
|
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 --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-get install -y git && apt-get clean
|
RUN apt-get update && apt-get install -y git && apt-get clean
|
||||||
|
|
||||||
ARG BRANCH=master SHA=ee46bef03a98903831c01d31094a0c30ea411b28
|
RUN --mount=type=cache,target=/root/.cache/pip \
|
||||||
RUN --mount=type=cache,target=/root/.cache/pip <<EOF
|
git clone https://github.com/comfyanonymous/ComfyUI.git stable-diffusion && \
|
||||||
git config --global http.postBuffer 1048576000
|
cd stable-diffusion && \
|
||||||
git clone https://github.com/comfyanonymous/ComfyUI.git stable-diffusion
|
git checkout master && \
|
||||||
cd stable-diffusion
|
git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \
|
||||||
git checkout ${BRANCH}
|
pip install -r requirements.txt
|
||||||
git reset --hard ${SHA}
|
|
||||||
pip install -r requirements.txt
|
ARG BRANCH=master SHA=884ea653c8d6fe19b3724f45a04a0d74cd881f2f
|
||||||
EOF
|
RUN --mount=type=cache,target=/root/.cache/pip \
|
||||||
|
cd stable-diffusion && \
|
||||||
|
git fetch && \
|
||||||
|
git checkout ${BRANCH} && \
|
||||||
|
git reset --hard ${SHA} && \
|
||||||
|
pip install -r requirements.txt
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/pip pip install -U 'transformers>=4.24'
|
RUN --mount=type=cache,target=/root/.cache/pip pip install -U 'transformers>=4.24'
|
||||||
|
|
||||||
# add info
|
# add info
|
||||||
COPY . /docker/
|
COPY . /docker/
|
||||||
RUN <<EOF
|
RUN chmod +x /docker/entrypoint.sh
|
||||||
chmod +x /docker/entrypoint.sh
|
|
||||||
EOF
|
|
||||||
|
|
||||||
WORKDIR /stable-diffusion
|
WORKDIR /stable-diffusion
|
||||||
|
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
|
||||||
|
ENV NVIDIA_VISIBLE_DEVICES=all
|
||||||
ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
|
ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
|
||||||
EXPOSE 7860
|
EXPOSE 7860
|
||||||
ENTRYPOINT ["/docker/entrypoint.sh"]
|
ENTRYPOINT ["/docker/entrypoint.sh"]
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ MOUNTS["${ROOT}/models/checkpoints"]="/data/StableDiffusion"
|
||||||
MOUNTS["${ROOT}/models/clip"]="/data/comfy/clip"
|
MOUNTS["${ROOT}/models/clip"]="/data/comfy/clip"
|
||||||
MOUNTS["${ROOT}/models/clip_vision"]="/data/comfy/clip_vision"
|
MOUNTS["${ROOT}/models/clip_vision"]="/data/comfy/clip_vision"
|
||||||
MOUNTS["${ROOT}/models/controlnet"]="/data/config/auto/extensions/sd-webui-controlnet/models"
|
MOUNTS["${ROOT}/models/controlnet"]="/data/config/auto/extensions/sd-webui-controlnet/models"
|
||||||
|
MOUNTS["${ROOT}/models/custom_nodes"]="/data/comfy/custom_nodes"
|
||||||
MOUNTS["${ROOT}/models/embeddings"]="/data/embeddings"
|
MOUNTS["${ROOT}/models/embeddings"]="/data/embeddings"
|
||||||
MOUNTS["${ROOT}/models/loras"]="/data/Lora"
|
MOUNTS["${ROOT}/models/loras"]="/data/Lora"
|
||||||
MOUNTS["${ROOT}/models/style_models"]="/data/comfy/style_models"
|
MOUNTS["${ROOT}/models/style_models"]="/data/comfy/style_models"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue