From 99a4f32da06d418fe221e0dcb861fa6778110266 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Mon, 1 Jan 2024 11:02:42 +0100
Subject: [PATCH] Update to latest

---
 docker-compose.yml        |  2 +-
 services/comfy/Dockerfile | 30 ++++--------------------------
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 93fba1d..065756f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,7 +60,7 @@ services:
     <<: *base_service
     profiles: ["comfy"]
     build: ./services/comfy/
-    image: sd-comfy:5
+    image: sd-comfy:6
     environment:
       - CLI_ARGS=
 
diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile
index 154a798..f813c68 100644
--- a/services/comfy/Dockerfile
+++ b/services/comfy/Dockerfile
@@ -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 434ce25ec00719ec67372482af2f0e6e517d548a && \
+  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=434ce25ec00719ec67372482af2f0e6e517d548a
-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}