From 40a9ec822701e67831f3607946408387ced51d9f Mon Sep 17 00:00:00 2001 From: Limitex <76650151+Limitex@users.noreply.github.com> Date: Sat, 8 Nov 2025 21:45:43 +0900 Subject: [PATCH 1/4] chore: use cuda 12.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9a2af0c..1872f91 100644 --- a/Dockerfile +++ b/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 From 1686e9fa1e5196abf3eef3676c2a7a743663e33a Mon Sep 17 00:00:00 2001 From: Limitex <76650151+Limitex@users.noreply.github.com> Date: Sat, 8 Nov 2025 19:55:30 +0900 Subject: [PATCH 2/4] chore: docker for developing --- .dockerignore | 8 ++++++-- .gitignore | 5 ++--- compose.yaml | 27 ++++++++++++++++++------- Dockerfile => docker/comfyui/Dockerfile | 2 -- docker/dev/Dockerfile | 24 ++++++++++++++++++++++ docker/models/checkpoints/.gitkeep | 0 docker/models/loras/.gitkeep | 0 docker/models/vae/.gitkeep | 0 docker/output/.gitkeep | 0 docker/workflows/.gitkeep | 0 10 files changed, 52 insertions(+), 14 deletions(-) rename Dockerfile => docker/comfyui/Dockerfile (83%) create mode 100644 docker/dev/Dockerfile delete mode 100644 docker/models/checkpoints/.gitkeep delete mode 100644 docker/models/loras/.gitkeep delete mode 100644 docker/models/vae/.gitkeep delete mode 100644 docker/output/.gitkeep delete mode 100644 docker/workflows/.gitkeep diff --git a/.dockerignore b/.dockerignore index 1a5e08c..23a647f 100644 --- a/.dockerignore +++ b/.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 diff --git a/.gitignore b/.gitignore index 5e896f1..6aab400 100644 --- a/.gitignore +++ b/.gitignore @@ -215,9 +215,8 @@ __marimo__/ # Streamlit .streamlit/secrets.toml -# Docker files -docker/ -!docker/.gitkeep +# Temporary files +tmp/ # Hugging Face artifacts *.safetensors diff --git a/compose.yaml b/compose.yaml index abcea19..580f3b9 100644 --- a/compose.yaml +++ b/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: diff --git a/Dockerfile b/docker/comfyui/Dockerfile similarity index 83% rename from Dockerfile rename to docker/comfyui/Dockerfile index 1872f91..78c859f 100644 --- a/Dockerfile +++ b/docker/comfyui/Dockerfile @@ -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 && \ diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile new file mode 100644 index 0000000..db0dd4d --- /dev/null +++ b/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 diff --git a/docker/models/checkpoints/.gitkeep b/docker/models/checkpoints/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/docker/models/loras/.gitkeep b/docker/models/loras/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/docker/models/vae/.gitkeep b/docker/models/vae/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/docker/output/.gitkeep b/docker/output/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/docker/workflows/.gitkeep b/docker/workflows/.gitkeep deleted file mode 100644 index e69de29..0000000 From 714251ca9901ec91b11ad77e7e7f63f47c314b54 Mon Sep 17 00:00:00 2001 From: Limitex <76650151+Limitex@users.noreply.github.com> Date: Sat, 8 Nov 2025 22:48:54 +0900 Subject: [PATCH 3/4] chore: sync requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9aae108..6743bb1 100644 --- a/requirements.txt +++ b/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" From 25d36656a7f3d3aec50d0dedca5785697dd954e5 Mon Sep 17 00:00:00 2001 From: Limitex <76650151+Limitex@users.noreply.github.com> Date: Sat, 8 Nov 2025 23:17:46 +0900 Subject: [PATCH 4/4] fix: taskfile --- Taskfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Taskfile.yml b/Taskfile.yml index acdd899..256a8dd 100644 --- a/Taskfile.yml +++ b/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"