a

Dockerfile

@@ -1,10 +1,19 @@
+# =============================================================
 # ComfyUI Dockerfile for Hugging Face Spaces
-# Pre-configured with LTX-Video 2.0 Models (Downloads at RUNTIME)
-# Total model size: ~42GB - Downloaded on first startup
-
-FROM python:3.12-slim-bookworm
-
+# With Persistent Storage & ComfyUI Manager
+# =============================================================
+# Features:
+#   - ComfyUI + ComfyUI-Manager pre-installed
+#   - Persistent storage via /data (survives restarts)
+#   - Auto GPU/CPU detection at runtime
+#   - All models, custom nodes, outputs persist across rebuilds
+# =============================================================
+
+FROM python:3.11-slim-bookworm
+
+# ---------------------------
 # Environment variables
+# ---------------------------
 ENV DEBIAN_FRONTEND=noninteractive \
     PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
@@ -12,9 +21,12 @@ ENV DEBIAN_FRONTEND=noninteractive \
     PIP_DISABLE_PIP_VERSION_CHECK=1 \
     COMFYUI_PATH=/app/ComfyUI \
     COMFYUI_PORT=7860 \
-    HF_HOME=/app/cache/huggingface
+    PYTORCH_CUDA_ALLOC_CONF=expandable_segments:True \
+    HF_HOME=/data/comfyui/.cache/huggingface
 
-# Install system dependencies
+# ---------------------------
+# System dependencies
+# ---------------------------
 RUN apt-get update && apt-get install -y --no-install-recommends \
     git \
     git-lfs \
@@ -27,33 +39,62 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libxrender1 \
     libgomp1 \
     ffmpeg \
+    procps \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+# ---------------------------
 # Create app directory
-RUN mkdir -p /app/cache/huggingface && chmod -R 777 /app
+# ---------------------------
+RUN mkdir -p /app/cache/huggingface && \
+    chmod -R 777 /app
 
 WORKDIR /app
 
-# Install PyTorch CPU
+# ---------------------------
+# Install PyTorch (CPU version — lightweight for build)
+# GPU Spaces will still work with this; for best GPU perf
+# switch to: --extra-index-url https://download.pytorch.org/whl/cu121
+# ---------------------------
 RUN pip install --upgrade pip && \
     pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
 
+# ---------------------------
 # Clone ComfyUI
+# ---------------------------
 RUN git clone --depth 1 https://github.com/Comfy-Org/ComfyUI.git ${COMFYUI_PATH}
 
 WORKDIR ${COMFYUI_PATH}
 
+# ---------------------------
 # Install ComfyUI dependencies
+# ---------------------------
 RUN pip install -r requirements.txt
 
+# ---------------------------
 # Install ComfyUI Manager
+# ---------------------------
 RUN git clone --depth 1 https://github.com/Comfy-Org/ComfyUI-Manager.git custom_nodes/ComfyUI-Manager
 
-# Install additional packages
-RUN pip install aiohttp requests tqdm Pillow numpy scipy huggingface_hub
-
-# Create all necessary directories
+# ---------------------------
+# Install additional packages commonly needed by nodes
+# ---------------------------
+RUN pip install \
+    aiohttp \
+    requests \
+    tqdm \
+    Pillow \
+    numpy \
+    scipy \
+    opencv-python-headless \
+    huggingface-hub \
+    safetensors \
+    accelerate \
+    pyyaml
+
+# ---------------------------
+# Create model directories (will be migrated to /data at runtime)
+# ---------------------------
 RUN mkdir -p \
     models/checkpoints \
     models/clip \
@@ -66,105 +107,35 @@ RUN mkdir -p \
     models/loras \
     models/photomaker \
     models/style_models \
-    models/text_encoders \
-    models/latent_upscale_models \
     models/unet \
     models/upscale_models \
     models/vae \
     models/vae_approx \
+    models/configs \
     input \
     output \
     temp \
     user \
     && chmod -R 777 /app
 
-# Extra model paths configuration
-RUN echo 'comfyui:\n\
-  base_path: /app/ComfyUI\n\
-  checkpoints: models/checkpoints\n\
-  clip: models/clip\n\
-  clip_vision: models/clip_vision\n\
-  configs: models/configs\n\
-  controlnet: models/controlnet\n\
-  embeddings: models/embeddings\n\
-  loras: models/loras\n\
-  text_encoders: models/text_encoders\n\
-  latent_upscale_models: models/latent_upscale_models\n\
-  upscale_models: models/upscale_models\n\
-  vae: models/vae' > extra_model_paths.yaml
-
-# Create entrypoint script that downloads models at runtime
-RUN cat > /app/entrypoint.sh << 'EOF'
-#!/bin/bash
-set -e
-
-cd /app/ComfyUI
-
-download_model() {
-    local url="$1"
-    local output="$2"
-    local name="$3"
-    
-    if [ -f "$output" ]; then
-        echo "✓ $name already exists, skipping..."
-    else
-        echo "⬇ Downloading $name..."
-        wget -q --show-progress --progress=bar:force -O "$output" "$url" || {
-            echo "✗ Failed to download $name, retrying..."
-            sleep 5
-            wget -q --show-progress --progress=bar:force -O "$output" "$url"
-        }
-        echo "✓ $name downloaded successfully"
-    fi
-}
-
-echo "=============================================="
-echo "  Downloading LTX-Video 2.0 Models..."
-echo "=============================================="
-
-# 1. LTX-2-19B Checkpoint (FP8) - 25.22 GB
-download_model \
-    "https://huggingface.co/Lightricks/LTX-2/resolve/main/ltx-2-19b-dev-fp8.safetensors" \
-    "models/checkpoints/ltx-2-19b-dev-fp8.safetensors" \
-    "LTX-2-19B Checkpoint (25.2 GB)"
-
-# 2. Gemma 3 12B Text Encoder (FP4 mixed) - 8.8 GB
-download_model \
-    "https://huggingface.co/Comfy-Org/ltx-2/resolve/main/split_files/text_encoders/gemma_3_12B_it_fp4_mixed.safetensors" \
-    "models/text_encoders/gemma_3_12B_it_fp4_mixed.safetensors" \
-    "Gemma 3 12B Text Encoder (8.8 GB)"
-
-# 3. LTX-2 Spatial Upscaler - 949.64 MB
-download_model \
-    "https://huggingface.co/Lightricks/LTX-2/resolve/main/ltx-2-spatial-upscaler-x2-1.0.safetensors" \
-    "models/latent_upscale_models/ltx-2-spatial-upscaler-x2-1.0.safetensors" \
-    "LTX-2 Spatial Upscaler (950 MB)"
-
-# 4. LTX-2 Distilled LoRA 384 - 7.15 GB
-download_model \
-    "https://huggingface.co/Lightricks/LTX-2/resolve/main/ltx-2-19b-distilled-lora-384.safetensors" \
-    "models/loras/ltx-2-19b-distilled-lora-384.safetensors" \
-    "LTX-2 Distilled LoRA (7.15 GB)"
-
-# 5. LTX-2 Camera Control LoRA (Dolly Left) - 312.15 MB
-download_model \
-    "https://huggingface.co/Lightricks/LTX-2-19b-LoRA-Camera-Control-Dolly-Left/resolve/main/ltx-2-19b-lora-camera-control-dolly-left.safetensors" \
-    "models/loras/ltx-2-19b-lora-camera-control-dolly-left.safetensors" \
-    "LTX-2 Camera Control LoRA (312 MB)"
-
-echo "=============================================="
-echo "  All models ready! Starting ComfyUI..."
-echo "=============================================="
-
-exec python main.py --listen 0.0.0.0 --port 7860 --enable-cors-header --preview-method auto --cpu
-EOF
-
-RUN chmod +x /app/entrypoint.sh
+# ---------------------------
+# Copy entrypoint script
+# ---------------------------
+COPY start.sh /app/start.sh
+RUN chmod +x /app/start.sh
 
+# ---------------------------
+# Expose port (HuggingFace Spaces expects 7860)
+# ---------------------------
 EXPOSE 7860
 
-HEALTHCHECK --interval=30s --timeout=10s --start-period=600s --retries=3 \
+# ---------------------------
+# Health check
+# ---------------------------
+HEALTHCHECK --interval=30s --timeout=10s --start-period=120s --retries=5 \
     CMD curl -f http://localhost:${COMFYUI_PORT}/ || exit 1
 
-# Run entrypoint which downloads models then starts ComfyUI
-ENTRYPOINT ["/app/entrypoint.sh"]
+# ---------------------------
+# Run via entrypoint (handles persistent storage + auto GPU/CPU)
+# ---------------------------
+ENTRYPOINT ["/app/start.sh"]