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:
PassiveLemon 2023-04-17 16:29:37 -04:00
parent 54a2da55a2
commit f4aae9e925
3 changed files with 19 additions and 17 deletions

View file

@ -67,7 +67,7 @@ services:
<<: *base_service
profiles: ["comfy"]
build: ./services/comfy/
image: sd-comfy:1
image: sd-comfy:6
volumes:
- *v2
environment:

View file

@ -1,34 +1,35 @@
# syntax=docker/dockerfile:1
FROM python:3.10.9-slim
SHELL ["/bin/bash", "-ceuxo", "pipefail"]
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 apt-get update && apt-get install -y git && apt-get clean
ARG BRANCH=master SHA=ee46bef03a98903831c01d31094a0c30ea411b28
RUN --mount=type=cache,target=/root/.cache/pip <<EOF
git config --global http.postBuffer 1048576000
git clone https://github.com/comfyanonymous/ComfyUI.git stable-diffusion
cd stable-diffusion
git checkout ${BRANCH}
git reset --hard ${SHA}
pip install -r requirements.txt
EOF
RUN --mount=type=cache,target=/root/.cache/pip \
git clone https://github.com/comfyanonymous/ComfyUI.git stable-diffusion && \
cd stable-diffusion && \
git checkout master && \
git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \
pip install -r requirements.txt
ARG BRANCH=master SHA=884ea653c8d6fe19b3724f45a04a0d74cd881f2f
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'
# add info
COPY . /docker/
RUN <<EOF
chmod +x /docker/entrypoint.sh
EOF
RUN chmod +x /docker/entrypoint.sh
WORKDIR /stable-diffusion
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
ENV NVIDIA_VISIBLE_DEVICES=all
ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
EXPOSE 7860
ENTRYPOINT ["/docker/entrypoint.sh"]

View file

@ -13,6 +13,7 @@ MOUNTS["${ROOT}/models/checkpoints"]="/data/StableDiffusion"
MOUNTS["${ROOT}/models/clip"]="/data/comfy/clip"
MOUNTS["${ROOT}/models/clip_vision"]="/data/comfy/clip_vision"
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/loras"]="/data/Lora"
MOUNTS["${ROOT}/models/style_models"]="/data/comfy/style_models"