From 9f7b0e7c4b2eea8c60de16236692094de421bfa5 Mon Sep 17 00:00:00 2001 From: John | Elite Encoder Date: Tue, 23 Dec 2025 02:29:57 -0500 Subject: [PATCH 1/4] fix(docker): update base image and add LD_LIBRARY_PATH in Dockerfiles - Changed the base image in Dockerfiles from `nvidia/cuda:12.8.1-cudnn-devel-ubuntu22.04` to `nvidia/cuda:12.8.1-devel-ubuntu22.04`. - Added `LD_LIBRARY_PATH` environment variable to the base Dockerfile for improved library management. - Cleaned up unnecessary cuDNN files in the base Dockerfile to optimize the image size. --- .devcontainer/devcontainer.json | 7 ++++--- .devcontainer/post-create.sh | 2 +- docker/Dockerfile.base | 6 ++++-- docker/Dockerfile.opencv | 4 ++-- pyproject.toml | 3 ++- requirements.txt | 1 + 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1c184f5cd..ab59e36d5 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,7 +8,7 @@ }, "runArgs": [ "--gpus=all" - ], + ], // Features to add to the dev container. More info: https://containers.dev/features. // Configure tool-specific properties. "customizations": { @@ -31,9 +31,10 @@ "appPort": [ "8188:8188", // ComfyUI "8889:8889", // ComfyStream - "3000:3000" // ComfyStream UI (optional) + "3000:3000", // ComfyStream UI (optional) + "8001:8001" // ComfyStream BYOC ], - "forwardPorts": [8188, 8889, 3000], + "forwardPorts": [8188, 8889, 3000, 8001], // Use 'forwardPorts' to make a list of ports inside the container available locally. // Use 'mounts' to make a list of local folders available inside the container. "workspaceFolder": "/workspace/comfystream", diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh index 9ac5dbec4..88422d85a 100755 --- a/.devcontainer/post-create.sh +++ b/.devcontainer/post-create.sh @@ -5,7 +5,7 @@ cd /workspace/comfystream # Install Comfystream in editable mode. echo -e "\e[32mInstalling Comfystream in editable mode...\e[0m" -/workspace/miniconda3/envs/comfystream/bin/python3 -m pip install -e .[server] -c src/comfystream/scripts/constraints.txt --root-user-action=ignore > /dev/null +/workspace/miniconda3/envs/comfystream/bin/python3 -m pip install -e .[dev,server] -c src/comfystream/scripts/constraints.txt --root-user-action=ignore > /dev/null # Install npm packages if needed if [ ! -d "/workspace/comfystream/ui/node_modules" ]; then diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 4172e9775..5bf6fb05b 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=nvidia/cuda:12.8.1-cudnn-devel-ubuntu22.04 \ +ARG BASE_IMAGE=nvidia/cuda:12.8.1-devel-ubuntu22.04 \ CONDA_VERSION=latest \ PYTHON_VERSION=3.12 @@ -11,7 +11,8 @@ ENV DEBIAN_FRONTEND=noninteractive \ TensorRT_ROOT=/opt/TensorRT-10.12.0.36 \ CONDA_VERSION="${CONDA_VERSION}" \ PATH="/workspace/miniconda3/bin:${PATH}" \ - PYTHON_VERSION="${PYTHON_VERSION}" + PYTHON_VERSION="${PYTHON_VERSION}" \ + LD_LIBRARY_PATH="/workspace/miniconda3/envs/comfystream/lib:${LD_LIBRARY_PATH}" # System dependencies RUN apt update && apt install -yqq --no-install-recommends \ @@ -48,6 +49,7 @@ conda run -n comfystream --no-capture-output pip install wheel RUN apt-get remove --purge -y libcudnn9-cuda-12 libcudnn9-dev-cuda-12 || true && \ apt-get autoremove -y && \ + rm -rf /usr/local/cuda/lib64/libcudnn* /usr/lib/x86_64-linux-gnu/libcudnn* && \ rm -rf /var/lib/apt/lists/* # Install numpy<2.0.0 first diff --git a/docker/Dockerfile.opencv b/docker/Dockerfile.opencv index 848db1fe8..2c5268592 100644 --- a/docker/Dockerfile.opencv +++ b/docker/Dockerfile.opencv @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=nvidia/cuda:12.8.1-cudnn-devel-ubuntu22.04 \ +ARG BASE_IMAGE=nvidia/cuda:12.8.1-devel-ubuntu22.04 \ CONDA_VERSION=latest \ PYTHON_VERSION=3.12 \ CUDA_VERSION=12.8 @@ -112,7 +112,7 @@ RUN cd /workspace/opencv/build && \ -D HAVE_opencv_python3=ON \ -D WITH_NVCUVID=OFF \ -D WITH_NVCUVENC=OFF \ - .. && \ + .. && \ make -j$(nproc) && \ make install && \ ldconfig diff --git a/pyproject.toml b/pyproject.toml index f667845a9..1513fc700 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,8 @@ dependencies = [ "toml", "twilio", "prometheus_client", - "librosa" + "librosa", + "mediapipe==0.10.15" ] [project.optional-dependencies] diff --git a/requirements.txt b/requirements.txt index 3b6bd29db..7728cffdc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,4 @@ toml twilio prometheus_client librosa +mediapipe==0.10.15 From 97849f8d95ac12ae360a3903085630fcd30ae031 Mon Sep 17 00:00:00 2001 From: John | Elite Encoder Date: Tue, 23 Dec 2025 16:40:13 -0500 Subject: [PATCH 2/4] revert devcontainer edits --- .devcontainer/devcontainer.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ab59e36d5..1c184f5cd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,7 +8,7 @@ }, "runArgs": [ "--gpus=all" - ], + ], // Features to add to the dev container. More info: https://containers.dev/features. // Configure tool-specific properties. "customizations": { @@ -31,10 +31,9 @@ "appPort": [ "8188:8188", // ComfyUI "8889:8889", // ComfyStream - "3000:3000", // ComfyStream UI (optional) - "8001:8001" // ComfyStream BYOC + "3000:3000" // ComfyStream UI (optional) ], - "forwardPorts": [8188, 8889, 3000, 8001], + "forwardPorts": [8188, 8889, 3000], // Use 'forwardPorts' to make a list of ports inside the container available locally. // Use 'mounts' to make a list of local folders available inside the container. "workspaceFolder": "/workspace/comfystream", From 8e7738f21dabfc10b5e4f4289f7e30d4617686aa Mon Sep 17 00:00:00 2001 From: John | Elite Encoder Date: Tue, 23 Dec 2025 16:54:59 -0500 Subject: [PATCH 3/4] revert edits to post-create.sh --- .devcontainer/post-create.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh index 88422d85a..9ac5dbec4 100755 --- a/.devcontainer/post-create.sh +++ b/.devcontainer/post-create.sh @@ -5,7 +5,7 @@ cd /workspace/comfystream # Install Comfystream in editable mode. echo -e "\e[32mInstalling Comfystream in editable mode...\e[0m" -/workspace/miniconda3/envs/comfystream/bin/python3 -m pip install -e .[dev,server] -c src/comfystream/scripts/constraints.txt --root-user-action=ignore > /dev/null +/workspace/miniconda3/envs/comfystream/bin/python3 -m pip install -e .[server] -c src/comfystream/scripts/constraints.txt --root-user-action=ignore > /dev/null # Install npm packages if needed if [ ! -d "/workspace/comfystream/ui/node_modules" ]; then From 87ced100c5404c278c48dfac9f17662ba67f4f55 Mon Sep 17 00:00:00 2001 From: John | Elite Encoder Date: Wed, 24 Dec 2025 03:31:08 +0000 Subject: [PATCH 4/4] chore(deps): revert mediapipe version pin --- pyproject.toml | 3 +-- requirements.txt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1513fc700..f667845a9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,8 +16,7 @@ dependencies = [ "toml", "twilio", "prometheus_client", - "librosa", - "mediapipe==0.10.15" + "librosa" ] [project.optional-dependencies] diff --git a/requirements.txt b/requirements.txt index 7728cffdc..3b6bd29db 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,3 @@ toml twilio prometheus_client librosa -mediapipe==0.10.15