From f4aae9e9252f8be67054e4ebb176f35944831105 Mon Sep 17 00:00:00 2001
From: PassiveLemon <lemonl3mn@protonmail.com>
Date: Mon, 17 Apr 2023 16:29:37 -0400
Subject: [PATCH] Fix Final

I forgot that I merged the main files so those would show up in the edits. This should have fixed that
---
 docker-compose.yml           |  2 +-
 services/comfy/Dockerfile    | 33 +++++++++++++++++----------------
 services/comfy/entrypoint.sh |  1 +
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1b7a9aa..87086d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -67,7 +67,7 @@ services:
     <<: *base_service
     profiles: ["comfy"]
     build: ./services/comfy/
-    image: sd-comfy:1
+    image: sd-comfy:6
     volumes:
       - *v2
     environment:
diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile
index f9eca7a..ac1673a 100644
--- a/services/comfy/Dockerfile
+++ b/services/comfy/Dockerfile
@@ -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"]
diff --git a/services/comfy/entrypoint.sh b/services/comfy/entrypoint.sh
index ccb167c..7703607 100644
--- a/services/comfy/entrypoint.sh
+++ b/services/comfy/entrypoint.sh
@@ -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"