Merge branch 'develop/docker' into develop/replace

.dockerignore

@@ -215,6 +215,12 @@ __marimo__/
 # Streamlit
 .streamlit/secrets.toml
 
+# Temporary files
+tmp/
+
+# Docker
+docker/
+
 # Hugging Face artifacts
 *.safetensors
 *.vae
@@ -256,5 +262,3 @@ Thumbs.db
 # Development tools config
 .pre-commit-config.yaml
 .commitizenrc
-pyproject.toml
-poetry.lock

.gitignore

@@ -215,9 +215,8 @@ __marimo__/
 # Streamlit
 .streamlit/secrets.toml
 
-# Docker files
-docker/
-!docker/.gitkeep
+# Temporary files
+tmp/
 
 # Hugging Face artifacts
 *.safetensors

Taskfile.yml

@@ -88,7 +88,7 @@ tasks:
   type:
     desc: "Run static type checking using mypy"
     cmds:
-      - poetry run mypy {{.PYTHON_DIRS}}
+      - poetry run mypy {{.PYTHON_DIRS}} __init__.py
 
   test:
     desc: "Run tests using pytest"

compose.yaml

@@ -1,6 +1,8 @@
 services:
   comfyui:
-    build: .
+    build: 
+      context: .
+      dockerfile: docker/comfyui/Dockerfile
     container_name: comfyui
     runtime: nvidia
     environment:
@@ -11,15 +13,26 @@ services:
       - POETRY_NO_INTERACTION=1
       - POETRY_CACHE_DIR=/tmp/poetry_cache
     volumes:
-      - ./docker/models/checkpoints:/app/ComfyUI/models/checkpoints
-      - ./docker/models/loras:/app/ComfyUI/models/loras
-      - ./docker/models/vae:/app/ComfyUI/models/vae
-      - ./docker/output:/app/ComfyUI/output
-      - ./docker/workflows:/app/ComfyUI/user/default/workflows
-      - ./docker/tmp:/app/ComfyUI/temp
+      - ./tmp/models/checkpoints:/app/ComfyUI/models/checkpoints
+      - ./tmp/models/loras:/app/ComfyUI/models/loras
+      - ./tmp/models/vae:/app/ComfyUI/models/vae
+      - ./tmp/output:/app/ComfyUI/output
+      - ./tmp/workflows:/app/ComfyUI/user/default/workflows
+      - ./tmp/tmp:/app/ComfyUI/temp
       - .:/app/ComfyUI/custom_nodes/ComfyUI-Diffusers
     ports:
       - "8188:8188"
     restart: unless-stopped
     stdin_open: true
     tty: true
+  
+  dev:
+    build:
+      context: .
+      dockerfile: docker/dev/Dockerfile
+    volumes:
+      - .:/app
+      - venv_data:/cache/.venv
+
+volumes:
+  venv_data:

docker/comfyui/Dockerfile

@@ -3,7 +3,7 @@ WORKDIR /app
 RUN git clone --depth 1 --branch v0.3.67 https://github.com/comfyanonymous/ComfyUI.git ComfyUI && \
     rm -rf ComfyUI/.git
 
-FROM pytorch/pytorch:2.9.0-cuda13.0-cudnn9-runtime
+FROM pytorch/pytorch:2.6.0-cuda12.4-cudnn9-runtime
 WORKDIR /app
 COPY --from=builder /app/ComfyUI /app/ComfyUI
 WORKDIR /app/ComfyUI
@@ -12,8 +12,6 @@ RUN apt-get update && \
         git \
         curl \
         build-essential \
-    && curl -1sLf 'https://dl.cloudsmith.io/public/task/task/setup.deb.sh' | bash \
-    && curl -sSL 'https://install.python-poetry.org' | python - \
     && pip install --no-cache-dir -r requirements.txt \
     && apt-get remove -y build-essential curl \
     && apt-get autoremove -y && \

docker/dev/Dockerfile

@@ -0,0 +1,24 @@
+FROM python:3.11-slim-bookworm
+ENV POETRY_HOME="/opt/poetry"
+ENV POETRY_VERSION="2.2.1"
+ENV POETRY_VIRTUALENVS_PATH="/cache/.venv"
+ENV POETRY_VIRTUALENVS_IN_PROJECT="false"
+ENV PATH="$POETRY_HOME/bin:$PATH"
+WORKDIR /app
+RUN mkdir -p /cache/.venv && chmod 777 /cache/.venv
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        git \
+        curl \
+        build-essential \
+        ca-certificates \
+    && curl -sSL https://install.python-poetry.org | python - \
+    && curl -1sLf 'https://dl.cloudsmith.io/public/task/task/setup.deb.sh' | bash \
+    && apt-get update \
+    && apt-get install -y task \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+RUN poetry self add \
+    poetry-plugin-export \
+    poetry-plugin-shell 
+RUN task --version && poetry --version

requirements.txt

@@ -38,7 +38,7 @@ psutil==7.1.2 ; python_version >= "3.10" and python_version < "3.15"
 pyyaml==6.0.3 ; python_version >= "3.10" and python_version < "3.15"
 regex==2025.10.23 ; python_version >= "3.10" and python_version < "3.15"
 requests==2.32.5 ; python_version >= "3.10" and python_version < "3.15"
-safetensors==0.6.2 ; python_version >= "3.10" and python_version < "3.15"
+safetensors==0.4.5 ; python_version >= "3.10" and python_version < "3.15"
 setuptools==80.9.0 ; python_version >= "3.12" and python_version < "3.15"
 sympy==1.14.0 ; python_version >= "3.10" and python_version < "3.15"
 tokenizers==0.22.1 ; python_version >= "3.10" and python_version < "3.15"