Update Dockerfile

Dockerfile

@@ -2,6 +2,7 @@
 
 FROM python:3.10-slim
 
+# Environment variables optimized for CPU and Hugging Face Spaces
 ENV DEBIAN_FRONTEND=noninteractive \
     PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
@@ -13,43 +14,48 @@ ENV DEBIAN_FRONTEND=noninteractive \
     OPENBLAS_NUM_THREADS=2 \
     NUMEXPR_NUM_THREADS=2 \
     TOKENIZERS_PARALLELISM=false \
+    HF_HUB_ENABLE_HF_TRANSFER=1 \
     HF_XET_HIGH_PERFORMANCE=1
 
 EXPOSE 7860
 
+# Install system dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
     git git-lfs curl wget ca-certificates ffmpeg libgl1 libglib2.0-0 \
     libsm6 libxext6 libxrender1 libgomp1 build-essential \
     && rm -rf /var/lib/apt/lists/* \
     && git lfs install
 
+# Create non-root user for security (UID 1000 matches HF Spaces default)
 RUN useradd --create-home --shell /bin/bash --uid 1000 user
 
 WORKDIR /app
 
+# Install PyTorch CPU version (Updated to stable 2.5.1, adjust if needed)
 RUN python -m pip install --upgrade pip setuptools wheel && \
     python -m pip install \
-      "torch==2.7.1" \
-      "torchvision==0.22.1" \
-      "torchaudio==2.7.1" \
-      --index-url https://download.pytorch.org/whl/cpu
+    "torch==2.5.1" \
+    "torchvision==0.20.1" \
+    "torchaudio==2.5.1" \
+    --index-url https://download.pytorch.org/whl/cpu
 
+# Clone ComfyUI and install base requirements
 RUN git clone --depth 1 https://github.com/comfyanonymous/ComfyUI.git /app/ComfyUI && \
     cd /app/ComfyUI && python -m pip install -r requirements.txt
 
-# Keep the CPU PyTorch versions after installing ComfyUI requirements.
+# Force reinstall CPU PyTorch to prevent ComfyUI requirements from pulling CUDA versions
 RUN python -m pip install --force-reinstall \
-      "torch==2.7.1" \
-      "torchvision==0.22.1" \
-      "torchaudio==2.7.1" \
-      --index-url https://download.pytorch.org/whl/cpu
+    "torch==2.5.1" \
+    "torchvision==0.20.1" \
+    "torchaudio==2.5.1" \
+    --index-url https://download.pytorch.org/whl/cpu
 
 # ------------------------------------------------------------------
-# Seven custom nodes
+# Install Custom Nodes
 # ------------------------------------------------------------------
 RUN mkdir -p /app/ComfyUI/custom_nodes && \
     cd /app/ComfyUI/custom_nodes && \
-    git clone https://github.com/ltdrdata/ComfyUI-Manager.git comfyui-manager && \
+    git clone --depth 1 https://github.com/ltdrdata/ComfyUI-Manager.git comfyui-manager && \
     git clone --depth 1 https://github.com/RealRebelAI/ComfyUI-GGUF_KREA-2.git ComfyUI-GGUF_KREA-2 && \
     git clone --depth 1 https://github.com/crystian/comfyui-crystools.git comfyui-crystools && \
     git clone --depth 1 https://github.com/rgthree/rgthree-comfy.git rgthree-comfy && \
@@ -63,23 +69,25 @@ RUN mkdir -p /app/ComfyUI/custom_nodes && \
     git clone --depth 1 https://github.com/ty0x2333/ComfyUI-Dev-Utils.git ComfyUI-Dev-Utils && \
     git clone --depth 1 https://github.com/ServiceStack/comfy-asset-downloader.git comfy-asset-downloader
 
-RUN set -eux; \
+# Install requirements for custom nodes
+# Pre-install headless opencv to prevent nodes from pulling heavy GUI opencv-python
+RUN python -m pip install opencv-python-headless && \
+    set -eux; \
     find /app/ComfyUI/custom_nodes -mindepth 1 -maxdepth 1 -type d | while read -r d; do \
         if [ -f "$d/requirements.txt" ]; then \
-            python -m pip install -r "$d/requirements.txt"; \
+            python -m pip install --no-cache-dir -r "$d/requirements.txt"; \
         fi; \
     done
 
+# Install additional common dependencies
 RUN python -m pip install \
-    "huggingface_hub>=0.33" "hf_transfer>=0.1.9" psutil websocket-client opencv-python-headless einops \
+    "huggingface_hub>=0.25.0" \
+    "hf_transfer>=0.1.9" \
+    psutil websocket-client einops \
     transformers safetensors color-matcher scikit-image numba dynamicprompts diffusers
 
 # ------------------------------------------------------------------
-# Runtime directories.
-#
-# IMPORTANT:
-# ComfyUI 0.35.x creates /app/ComfyUI/user at startup.
-# It must be writable by the non-root "user" account.
+# Runtime directories and permissions
 # ------------------------------------------------------------------
 RUN mkdir -p \
     /app/ComfyUI/user \
@@ -97,16 +105,17 @@ RUN mkdir -p \
     /app/ComfyUI/temp \
     /data && \
     chown -R user:user \
-      /app/ComfyUI/user \
-      /app/ComfyUI/models \
-      /app/ComfyUI/workflows \
-      /app/ComfyUI/input \
-      /app/ComfyUI/output \
-      /app/ComfyUI/temp \
-      /data
+    /app/ComfyUI/user \
+    /app/ComfyUI/models \
+    /app/ComfyUI/workflows \
+    /app/ComfyUI/input \
+    /app/ComfyUI/output \
+    /app/ComfyUI/temp \
+    /data
 
+# Copy startup script (⚠️ IMPORTANT: start.sh must exist in your build directory)
 COPY --chown=user start.sh /app/start.sh
-RUN chmod +x /app/start.sh && chown user:user /app/start.sh
+RUN chmod +x /app/start.sh
 
 USER user
 
@@ -116,21 +125,24 @@ ENV HOME=/home/user \
     PATH=/home/user/.local/bin:$PATH \
     PYTHONPATH=/app/ComfyUI
 
-# Build-time sanity check.
+# Build-time sanity check (Fixed: removed non-existent comfy_kitchen import)
 RUN python - <<'PY'
 import torch
-print("PyTorch:", torch.__version__)
-print("CUDA available:", torch.cuda.is_available())
-assert torch.__version__.startswith("2.7.1")
-assert not torch.cuda.is_available()
-
-import comfy_kitchen
-print("comfy_kitchen:", comfy_kitchen.__file__)
-print("int8_attention_is_available:",
-      hasattr(comfy_kitchen, "int8_attention_is_available"))
+print("PyTorch Version:", torch.__version__)
+print("CUDA Available:", torch.cuda.is_available())
+
+# Verify CPU-only build
+assert torch.__version__.startswith("2.5.1"), f"Expected PyTorch 2.5.1, got {torch.__version__}"
+assert not torch.cuda.is_available(), "CUDA should not be available in CPU build"
+
+# Verify ComfyUI core is importable
+import comfy
+print("ComfyUI core imported successfully")
 PY
 
+COPY ./workflow /app/ComfyUI/user/default/workflows/
+
 HEALTHCHECK --interval=30s --timeout=10s --start-period=180s --retries=5 \
-  CMD curl -fsS http://127.0.0.1:7860/system_stats >/dev/null || exit 1
+    CMD curl -fsS http://127.0.0.1:7860/system_stats >/dev/null || exit 1
 
-ENTRYPOINT ["/app/start.sh"]
+ENTRYPOINT ["/app/start.sh"]