Update deps

YanWenKun · Jan 8, 2025 · 5a93831 · 5a93831
1 parent 339038f
commit 5a93831
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 5 deletions.
diff --git a/comfy3d-pt25/builder-scripts/pak5.txt b/comfy3d-pt25/builder-scripts/pak5.txt
@@ -48,6 +48,7 @@ slangtorch
 soundfile
 spandrel
 tokenizers
+toml
 torchsde
 torchtyping
 tqdm

diff --git a/cu121-megapak/Dockerfile b/cu121-megapak/Dockerfile
@@ -206,7 +206,13 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 
 RUN --mount=type=cache,target=/root/.cache/pip \
     pip install \
-        -r /builder-scripts/pak7.txt \
+        -r /builder-scripts/pak7.txt
+
+# Make sure the deps fit the needs for ComfyUI & Manager
+RUN --mount=type=cache,target=/root/.cache/pip \
+    pip install \
+        -r https://github.com/comfyanonymous/ComfyUI/raw/refs/heads/master/requirements.txt \
+        -r https://github.com/ltdrdata/ComfyUI-Manager/raw/refs/heads/main/requirements.txt \
     && pip list
 
 ################################################################################

diff --git a/cu121-megapak/builder-scripts/pak5.txt b/cu121-megapak/builder-scripts/pak5.txt
@@ -40,6 +40,7 @@ soundfile
 spandrel
 svglib
 tokenizers
+toml
 torchsde
 tqdm
 transparent-background

diff --git a/cu124-cn/Dockerfile b/cu124-cn/Dockerfile
@@ -153,7 +153,13 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 
 RUN --mount=type=cache,target=/root/.cache/pip \
     pip install \
-        -r /builder-scripts/pak7.txt \
+        -r /builder-scripts/pak7.txt
+
+# 确保依赖项匹配 ComfyUI & Manager
+RUN --mount=type=cache,target=/root/.cache/pip \
+    pip install \
+        -r https://github.com/comfyanonymous/ComfyUI/raw/refs/heads/master/requirements.txt \
+        -r https://github.com/ltdrdata/ComfyUI-Manager/raw/refs/heads/main/requirements.txt \
     && pip list
 
 ################################################################################

diff --git a/cu124-cn/README.adoc b/cu124-cn/README.adoc
@@ -46,7 +46,7 @@ https://podman-desktop.io/docs/podman/gpu[容器内 GPU 访问] 。
 * 以下命令均使用了一次性容器 (`--rm`) 来保持环境整洁、配置清晰。
 * 不建议 WSL2 用户把文件存放在 NTFS 分区内，跨文件系统互访性能极低，且会权限混乱。
 * 注意命令中的 `dockerproxy.cn` 为 Docker Hub 镜像站点地址。如果站点失效，可替换为备用地址，
-https://www.coderjia.cn/archives/dba3f94c-a021-468a-8ac6-e840f85867ea[参考列表]
+https://www.coderjia.cn/archives/dba3f94c-a021-468a-8ac6-e840f85867ea[国内可用 Docker 镜像源汇总]
 。
 
 .使用 Docker
@@ -175,7 +175,7 @@ docker build . -t yanwk/comfyui-boot:cu124-cn -f Dockerfile-cn
 
 * Docker Hub 镜像仓库
 ** dockerproxy.cn
-** https://www.coderjia.cn/archives/dba3f94c-a021-468a-8ac6-e840f85867ea[参考列表]
+** https://www.coderjia.cn/archives/dba3f94c-a021-468a-8ac6-e840f85867ea[国内可用 Docker 镜像源汇总]
 ** 替换为 `docker.io` 即为官方源地址
 
 * PyPI

diff --git a/cu124-cn/builder-scripts/pak5.txt b/cu124-cn/builder-scripts/pak5.txt
@@ -40,6 +40,7 @@ soundfile
 spandrel
 svglib
 tokenizers
+toml
 torchsde
 tqdm
 transparent-background

diff --git a/cu124-megapak/Dockerfile b/cu124-megapak/Dockerfile
@@ -200,7 +200,13 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 
 RUN --mount=type=cache,target=/root/.cache/pip \
     pip install \
-        -r /builder-scripts/pak7.txt \
+        -r /builder-scripts/pak7.txt
+
+# Make sure the deps fit the needs for ComfyUI & Manager
+RUN --mount=type=cache,target=/root/.cache/pip \
+    pip install \
+        -r https://github.com/comfyanonymous/ComfyUI/raw/refs/heads/master/requirements.txt \
+        -r https://github.com/ltdrdata/ComfyUI-Manager/raw/refs/heads/main/requirements.txt \
     && pip list
 
 ################################################################################

diff --git a/cu124-megapak/builder-scripts/pak5.txt b/cu124-megapak/builder-scripts/pak5.txt
@@ -40,6 +40,7 @@ soundfile
 spandrel
 svglib
 tokenizers
+toml
 torchsde
 tqdm
 transparent-background