From 08a12867d19a587f2b4d47fcff2fb355e01f6d97 Mon Sep 17 00:00:00 2001
From: clsferguson <48876201+clsferguson@users.noreply.github.com>
Date: Tue, 30 Sep 2025 11:29:25 -0600
Subject: [PATCH] feat(dockerfile): add Cairo/pkg-config for pycairo and define
 COMFYUI path env vars
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Install pkg-config, libcairo2, and libcairo2-dev so pip can build/use pycairo required by svglib/rlPyCairo, preventing meson/pkg-config “Dependency cairo not found” errors on Debian/Ubuntu bases.
- Define COMFYUI_PATH=/app/ComfyUI and both COMFYUI_MODEL_PATH=/app/ComfyUI/models and COMFYUI_MODELS_PATH=/app/ComfyUI/models to satisfy common tool conventions and silence CLI warnings, while remaining compatible with extra_model_paths.yaml for canonical model routing.
---
 Dockerfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5f0baa90b..198ef84ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,10 @@ ENV DEBIAN_FRONTEND=noninteractive \
     EXT_PARALLEL=4 \
     NVCC_APPEND_FLAGS="--threads 8" \
     MAX_JOBS=32 \
-    SAGE_ATTENTION_AVAILABLE=0
+    SAGE_ATTENTION_AVAILABLE=0 \
+    COMFYUI_PATH=/app/ComfyUI \
+    COMFYUI_MODEL_PATH=/app/ComfyUI/models \
+    COMFYUI_MODELS_PATH=/app/ComfyUI/models
 
 # Enable non-free repositories and install system deps + CUDA toolkit
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -29,6 +32,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
     ninja-build \
     patch \
+    pkg-config \
+    libcairo2 \
+    libcairo2-dev \
  && echo "deb http://deb.debian.org/debian trixie main contrib non-free non-free-firmware" > /etc/apt/sources.list.d/non-free.list \
  && wget https://developer.download.nvidia.com/compute/cuda/repos/debian12/x86_64/cuda-keyring_1.1-1_all.deb \
  && dpkg -i cuda-keyring_1.1-1_all.deb \