docker v3: bake everything into /workspace (ComfyUI, workflows, download_missing_models.sh) + auto-start ComfyUI

docker/Dockerfile

@@ -1,30 +1,39 @@
 # ComfyUI Qwen-Image-Edit base image (H100 / RunPod)
 #
 # NOTE: published plx1029/comfyui-qwen tags were NOT built from this file — they
-# were assembled daemonlessly (v1: crane append on the pod; v2: skopeo + umoci).
-# This Dockerfile is the reproducible equivalent: building it on any machine
-# with Docker produces the same setup.
+# were assembled daemonlessly (v1: crane append on the pod; v2: skopeo + umoci;
+# v3: crane append of a /workspace layer on top of v2). This Dockerfile is the
+# reproducible equivalent: building it on any machine with Docker produces the
+# same setup.
 #
-# Build from the REPO ROOT (context needs download_missing_models.sh):
-#   docker build -t plx1029/comfyui-qwen:v2 -f docker/Dockerfile .
-#   docker push plx1029/comfyui-qwen:v2
+# Build from the REPO ROOT (context needs download_missing_models.sh + workflows/):
+#   docker build -t plx1029/comfyui-qwen:v3 -f docker/Dockerfile .
+#   docker push plx1029/comfyui-qwen:v3
 #
 # No secrets are baked into this image (it is public). The model-download
 # script prompts for your Hugging Face token at runtime (or reads $HF_TOKEN).
+#
+# v3: EVERYTHING lives in /workspace — /workspace/ComfyUI, /workspace/workflows,
+# /workspace/download_missing_models.sh — and ComfyUI auto-starts on boot.
+# A compressed seed of the /workspace payload is kept at /opt/workspace-seed.tar.gz
+# so that when a network volume is mounted over /workspace (shadowing the baked
+# files), seed-workspace.sh restores the missing pieces without touching
+# anything already on the volume.
 
 FROM runpod/pytorch:1.0.2-cu1281-torch280-ubuntu2404
 
 ARG COMFYUI_COMMIT=35c1470935044be5610a81d46e57922a8a598c6c
 ARG RGTHREE_COMMIT=27b4f4cdcf3b127c29d5d8135ac1536ecbd4c383
 
-# ComfyUI pinned to the exact commit; torch stack already in base -> only light deps install
-RUN git clone https://github.com/comfyanonymous/ComfyUI.git /ComfyUI && \
-    cd /ComfyUI && git checkout ${COMFYUI_COMMIT} && \
+# ComfyUI pinned to the exact commit, IN /workspace; torch stack already in
+# base -> only light deps install
+RUN git clone https://github.com/comfyanonymous/ComfyUI.git /workspace/ComfyUI && \
+    cd /workspace/ComfyUI && git checkout ${COMFYUI_COMMIT} && \
     pip install -r requirements.txt
 
 # Custom nodes: rgthree (Power Lora Loader) + ComfyUI-Manager
-RUN git clone https://github.com/rgthree/rgthree-comfy.git /ComfyUI/custom_nodes/rgthree-comfy && \
-    cd /ComfyUI/custom_nodes/rgthree-comfy && git checkout ${RGTHREE_COMMIT} && \
+RUN git clone https://github.com/rgthree/rgthree-comfy.git /workspace/ComfyUI/custom_nodes/rgthree-comfy && \
+    cd /workspace/ComfyUI/custom_nodes/rgthree-comfy && git checkout ${RGTHREE_COMMIT} && \
     pip install comfyui-manager==4.2.2
 
 # Hugging Face hub tooling for fast model downloads (hf_transfer is best-effort:
@@ -42,21 +51,28 @@ RUN curl -fsSL https://claude.ai/install.sh | bash && \
 ENV PATH="/root/.local/bin:${PATH}"
 
 # Manager config baked in: security_level=weak, network_mode=personal_cloud
-COPY docker/config.ini /ComfyUI/user/__manager/config.ini
-COPY docker/comfy.settings.json /ComfyUI/user/default/comfy.settings.json
-COPY docker/workflows/ /ComfyUI/user/default/workflows/
-
-# Model downloader: picks workflows, finds their models in the HF repo
-# (aleph65/ComfyUI), downloads the missing ones into place. Prompts for the
-# HF token; bootstraps /workspace/workflows from the repo if absent.
-COPY download_missing_models.sh /usr/local/bin/download_missing_models.sh
-
-# Startup: `comfy` runs ComfyUI (prefers /workspace/ComfyUI when a volume is
-# attached). ComfyUI is NOT auto-started; run `comfy` yourself, or set
-# COMFY_AUTOSTART=true in the pod env to restore the old behaviour.
+COPY docker/config.ini /workspace/ComfyUI/user/__manager/config.ini
+COPY docker/comfy.settings.json /workspace/ComfyUI/user/default/comfy.settings.json
+COPY workflows/ /workspace/ComfyUI/user/default/workflows/
+
+# Workflows + model downloader live in /workspace too. The downloader picks
+# workflows, finds their models in the HF repo (aleph65/ComfyUI), and downloads
+# the missing ones into /workspace/ComfyUI/models/. Prompts for the HF token
+# (or reads $HF_TOKEN). Kept on PATH via a symlink.
+COPY workflows/ /workspace/workflows/
+COPY download_missing_models.sh /workspace/download_missing_models.sh
+RUN chmod +x /workspace/download_missing_models.sh && \
+    ln -sf /workspace/download_missing_models.sh /usr/local/bin/download_missing_models.sh
+
+# Seed tarball: restores /workspace when a network volume shadows it
+RUN tar -czf /opt/workspace-seed.tar.gz -C /workspace ComfyUI workflows download_missing_models.sh
+
+# Startup: seed /workspace if needed, then AUTO-START ComfyUI (v3 default).
+# Set COMFY_AUTOSTART=false in the pod env to disable; `comfy` runs it manually.
+COPY docker/seed-workspace.sh /usr/local/bin/seed-workspace.sh
 COPY docker/comfy /usr/local/bin/comfy
 COPY docker/start-comfy.sh /start-comfy.sh
-RUN chmod +x /usr/local/bin/comfy /start-comfy.sh /usr/local/bin/download_missing_models.sh
+RUN chmod +x /usr/local/bin/comfy /usr/local/bin/seed-workspace.sh /start-comfy.sh
 
 EXPOSE 7865
 CMD ["/start-comfy.sh"]

docker/README.md

@@ -3,52 +3,62 @@
 Everything from the manual setup is baked in — **no reinstalling on new pods**:
 
 - Base: `runpod/pytorch:1.0.2-cu1281-torch280-ubuntu2404` (torch 2.8.0+cu128, Python 3.12)
-- ComfyUI @ `35c1470935044be5610a81d46e57922a8a598c6c` at `/ComfyUI`
+- **v3: everything lives in `/workspace`:**
+  - ComfyUI @ `35c1470935044be5610a81d46e57922a8a598c6c` at **`/workspace/ComfyUI`**
+  - workflows at **`/workspace/workflows/`** (`qwen-loras-very-good-nsfw.json`,
+    `qwen-edit-nsfw.json`, `head-swap-flux-klein.json`) — also baked into the
+    ComfyUI workflow browser
+  - **`/workspace/download_missing_models.sh`** — pick workflows, it fetches their
+    missing models from `hf.co/aleph65/ComfyUI` into place (prompts for HF token
+    or reads `$HF_TOKEN`); still on PATH via symlink
+- **v3: ComfyUI AUTO-STARTS on boot** (port **7865**, log `/workspace/comfyui.log`,
+  auto-restart loop). Set `COMFY_AUTOSTART=false` in the pod env to disable.
 - rgthree-comfy @ `27b4f4c` in `custom_nodes/`
-- comfyui-manager 4.2.2 + all pip deps (65 packages) preinstalled system-wide
+- comfyui-manager 4.2.2 + all pip deps preinstalled system-wide
 - Manager config baked: `security_level = weak`, `network_mode = personal_cloud`
-- Workflows baked into the workflow browser: `qwen-loras-very-good-nsfw.json`, `qwen-edit-nsfw.json`
-- **v2:** `huggingface_hub` + `hf_transfer` preinstalled for fast model downloads
-- **v2:** [Claude Code](https://claude.com/claude-code) CLI preinstalled (`claude`), on PATH,
+- `huggingface_hub` + `hf_transfer` preinstalled for fast model downloads
+- [Claude Code](https://claude.com/claude-code) CLI preinstalled (`claude`), on PATH,
   with `bypassPermissions` as the default permission mode
-- **v2:** `download_missing_models.sh` on PATH — pick workflows, it fetches their
-  missing models from `hf.co/aleph65/ComfyUI` into place (prompts for HF token;
-  bootstraps `/workspace/workflows` from the repo if absent)
-- **v2:** ComfyUI **no longer auto-starts** — run `comfy` yourself, or set
-  `COMFY_AUTOSTART=true` in the pod env for the old behaviour (port **7865**,
-  log: `/workspace/comfyui.log`)
+- The old image-root `/ComfyUI` copy is **removed** (whiteout) — `/workspace` is
+  the single source of truth.
 
 Models are NOT in the image (keep them on the network volume, as before).
-No secrets are baked in either (the image is public) — the download script asks
-for your Hugging Face token at runtime, or reads it from `$HF_TOKEN`.
+No secrets are baked in either (the image is public).
+
+## Network volumes
+
+If a network volume is mounted at `/workspace` it shadows the baked-in files.
+On boot, `seed-workspace.sh` restores whatever is missing (`ComfyUI/`,
+`workflows/`, `download_missing_models.sh`) from a compressed seed at
+`/opt/workspace-seed.tar.gz` — **never overwriting existing files**, so models
+and outputs already on the volume are untouched.
 
 ## Using it on RunPod
 
-1. Create a template with container image `plx1029/comfyui-qwen:v2`.
+1. Create a template with container image `plx1029/comfyui-qwen:v3`.
 2. Expose HTTP port **7865** (plus 8888/22 as usual).
-3. Attach your network volume at `/workspace`.
-4. In a terminal: `download_missing_models.sh` to fetch models, then `comfy` to start.
-
-When ComfyUI starts it:
-- uses `/workspace/ComfyUI` if it exists (your current volume — models already there);
-- otherwise seeds a fresh `/workspace/ComfyUI` from the baked-in copy;
-- SSH / Jupyter / nginx from the stock RunPod start script work normally either way.
+3. (Optional) attach your network volume at `/workspace`.
+4. ComfyUI starts automatically. In a terminal: `download_missing_models.sh`
+   to fetch models for your workflows.
 
-`COMFY_PORT` overrides the port. `COMFY_AUTOSTART=true` restores auto-start on boot.
+`COMFY_PORT` overrides the port. `COMFY_AUTOSTART=false` disables auto-start
+(then run `comfy` manually).
 
 ## How the image was built
 
-No Docker daemon exists on RunPod pods, so images are assembled daemonlessly:
-v1 with [`crane`](https://github.com/google/go-containerregistry) (pip-delta +
-git clones appended as one OCI layer); v2 with `skopeo` + `umoci` (unpack v1,
-apply changes in a chroot, repack the delta as a new layer) — the 20 GB base is
-never re-uploaded.
+No Docker daemon exists on RunPod pods (or the build sandbox), so images are
+assembled daemonlessly: v1 with [`crane`](https://github.com/google/go-containerregistry)
+(pip-delta + git clones appended as one OCI layer); v2 with `skopeo` + `umoci`;
+**v3 with `crane append`** — a single layer holding `/workspace` (ComfyUI +
+workflows + downloader), the seed tarball, the new startup scripts, and a
+whiteout of the old `/ComfyUI`, appended on top of v2 (the ~11 GB base is never
+re-uploaded).
 
 `Dockerfile` in this directory is the reproducible equivalent for rebuilding on
 any machine with real Docker (build from the repo root — the context needs
-`download_missing_models.sh`):
+`download_missing_models.sh` and `workflows/`):
 
 ```bash
-docker build -t plx1029/comfyui-qwen:v2 -f docker/Dockerfile .
-docker push plx1029/comfyui-qwen:v2
+docker build -t plx1029/comfyui-qwen:v3 -f docker/Dockerfile .
+docker push plx1029/comfyui-qwen:v3
 ```

docker/comfy

@@ -1,22 +1,14 @@
 #!/bin/bash
-# Run ComfyUI in the foreground.
-# Prefers /workspace/ComfyUI (network volume, persists models); falls back to
-# the copy baked into the image at /ComfyUI. On a fresh volume, seeds
-# /workspace/ComfyUI from the baked-in copy so models/outputs persist.
+# Run ComfyUI in the foreground from /workspace/ComfyUI.
+# v3: everything lives in /workspace, baked into the image. If a network
+# volume is mounted over /workspace (shadowing the baked-in files), the
+# missing pieces are restored from the seed at /opt/workspace-seed.tar.gz.
 set -e
 
 COMFY_PORT="${COMFY_PORT:-7865}"
 
-if [[ -d /workspace/ComfyUI ]]; then
-    COMFY_HOME=/workspace/ComfyUI
-elif [[ -d /workspace && -w /workspace ]]; then
-    echo "Seeding /workspace/ComfyUI from image..."
-    cp -a /ComfyUI /workspace/ComfyUI
-    COMFY_HOME=/workspace/ComfyUI
-else
-    COMFY_HOME=/ComfyUI
-fi
+/usr/local/bin/seed-workspace.sh
 
-echo "Starting ComfyUI from ${COMFY_HOME} on port ${COMFY_PORT}"
-cd "${COMFY_HOME}"
+echo "Starting ComfyUI from /workspace/ComfyUI on port ${COMFY_PORT}"
+cd /workspace/ComfyUI
 exec python3 main.py --listen 0.0.0.0 --port "${COMFY_PORT}" "$@"

docker/seed-workspace.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# Ensure /workspace holds the full setup (ComfyUI, workflows,
+# download_missing_models.sh). Everything is baked into the image at
+# /workspace already; this only matters when a network volume is mounted
+# over /workspace and shadows the baked-in files — then the missing pieces
+# are restored from /opt/workspace-seed.tar.gz. Existing files are never
+# overwritten (tar --skip-old-files), so models/outputs on a volume are safe.
+set -e
+
+if [[ ! -d /workspace || ! -w /workspace ]]; then
+    echo "[seed-workspace] /workspace missing or not writable — skipping." >&2
+    exit 0
+fi
+
+if [[ ! -d /workspace/ComfyUI || ! -d /workspace/workflows || ! -f /workspace/download_missing_models.sh ]]; then
+    echo "[seed-workspace] Restoring missing /workspace files from image seed..."
+    tar -xzf /opt/workspace-seed.tar.gz -C /workspace --skip-old-files
+    echo "[seed-workspace] Done."
+fi

docker/start-comfy.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
-# Image CMD: hand off to the stock RunPod /start.sh (SSH, Jupyter, nginx).
-# ComfyUI does NOT auto-start — run `comfy` yourself when you're ready.
-# Set COMFY_AUTOSTART=true in the pod env to restore the old auto-start
-# behaviour (background loop with auto-restart).
+# Image CMD: make sure /workspace is fully populated, start ComfyUI in the
+# background (auto-restart loop), then hand off to the stock RunPod
+# /start.sh (SSH, Jupyter, nginx).
+# v3: ComfyUI AUTO-STARTS by default. Set COMFY_AUTOSTART=false to disable.
 
-if [[ "${COMFY_AUTOSTART:-false}" == "true" ]]; then
+/usr/local/bin/seed-workspace.sh || true
+
+if [[ "${COMFY_AUTOSTART:-true}" != "false" ]]; then
     LOG=/workspace/comfyui.log
     [[ -d /workspace && -w /workspace ]] || LOG=/var/log/comfyui.log
     (
@@ -15,9 +17,9 @@ if [[ "${COMFY_AUTOSTART:-false}" == "true" ]]; then
         done
     ) &
     echo "ComfyUI starting in background (log: $LOG, port ${COMFY_PORT:-7865})"
-else
-    echo "ComfyUI not auto-started. Run 'comfy' to start it (port ${COMFY_PORT:-7865})."
     echo "Run 'download_missing_models.sh' to fetch models for your workflows."
+else
+    echo "ComfyUI not auto-started (COMFY_AUTOSTART=false). Run 'comfy' to start it (port ${COMFY_PORT:-7865})."
 fi
 
 exec /start.sh