Skip to content

Commit a692c6d

Browse files
author
yinsu.zs
committed
chore: 收敛构建改动并更新 FunArt 依赖版本号
- 根 Makefile:去掉向 agent 透传 COMFYUI_IMAGE 的 build-arg。 - comfyui Makefile:移除 OSS_COMFYUI_LEGACY_SEED,input/models 恢复硬编码 v0.3.77-alpha;dependency_version 写入 1.6.7。 - ComfyUI Dockerfile:首次安装 requirements 不再附带 cu128 extra-index。 - Agent Dockerfile:built-in version.txt 写入 1.6.7。 Change-Id: Ia9a97b1f933082d2fb620651466d720d31cc73ba Co-developed-by: Cursor <noreply@cursor.com>
1 parent a39b601 commit a692c6d

4 files changed

Lines changed: 10 additions & 15 deletions

File tree

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ release:
4545
# ————————————————————————————————————————————————————————————————————————————————————————————————————————————————————
4646
# Agent镜像相关
4747
# 镜像构建
48-
# 可选: COMFYUI_IMAGE=... 传给 agent 的 docker build
49-
COMFYUI_BUILD_ARGS := $(if $(strip $(COMFYUI_IMAGE)),--build-arg COMFYUI_IMAGE=$(COMFYUI_IMAGE),)
5048
.PHONY: build
5149
build:
52-
cd src/code/agent && docker build --platform linux/amd64 $(COMFYUI_BUILD_ARGS) -t $(AGENT_IMAGE) .
50+
cd src/code/agent && docker build --platform linux/amd64 -t $(AGENT_IMAGE) .
5351
docker tag $(AGENT_IMAGE) agent
5452

5553
# 本地测试运行

src/code/agent/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ COPY --from=comfyui_source /root/built-in/custom_nodes /root/built-in/custom_nod
5050

5151
# 写入内置插件版本号,供启动时版本检查使用
5252
# 版本号需随内置插件列表的实质性变化(增删插件、升级版本)而更新
53-
RUN echo "1.6.5" > /root/built-in/version.txt
53+
RUN echo "1.6.7" > /root/built-in/version.txt
5454

5555
ENV WORK_DIR='/root'
5656
ENV COMFYUI_DIR="${WORK_DIR}/comfyui"

src/code/comfyui/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ COPY --from=codes ${COMFYUI_DIR} ${COMFYUI_DIR}
108108
RUN --mount=type=cache,target=/root/.cache/pip \
109109
cd ${COMFYUI_DIR} && \
110110
if [ -f requirements.txt ]; then \
111-
/root/venv/bin/pip install -r requirements.txt --no-cache-dir \
112-
--extra-index-url https://download.pytorch.org/whl/cu128; \
111+
/root/venv/bin/pip install -r requirements.txt --no-cache-dir; \
113112
else \
114113
echo "警告: ${COMFYUI_DIR}/requirements.txt 不存在"; \
115114
fi

src/code/comfyui/Makefile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ COMFYUI_DEEPGPU_IMAGE = comfyui:deepgpu-v0.19.4-v1
55
OSS_BUCKET ?= dipper-cache-$(REGION)
66
OSS_COMFYUI_BASE_DIR = base/comfyui/v0.19.4-alpha
77
OSS_COMFYUI_DEEPGPU_BASE_DIR = base/comfyui/v0.19.4-alpha-deepgpu
8-
# 上传新基线时,从旧基线拷贝 input/models(若你们 OSS 上旧路径不同,可 make OSS_COMFYUI_LEGACY_SEED=base/comfyui/xxx)
9-
OSS_COMFYUI_LEGACY_SEED ?= base/comfyui/v0.3.77-gamma
108

119
.PHONY: upgrade
1210
upgrade: build upload-base
@@ -60,16 +58,16 @@ upload-base:
6058

6159
@echo "Creating .funart/VERSION.txt..."
6260
@mkdir -p ./tmp/.funart
63-
@echo "0.19.4" > ./tmp/.funart/dependency_version.txt
61+
@echo "1.6.7" > ./tmp/.funart/dependency_version.txt
6462

6563
@echo "Uploading files to OSS..."
6664
ossutil cp -r ./tmp/models oss://$(OSS_BUCKET)/$(OSS_COMFYUI_BASE_DIR)/models && \
6765
ossutil cp -r ./tmp/custom_nodes oss://$(OSS_BUCKET)/$(OSS_COMFYUI_BASE_DIR)/custom_nodes && \
6866
ossutil cp ./tmp/comfyui.tar.zst oss://$(OSS_BUCKET)/$(OSS_COMFYUI_BASE_DIR)/snapshots/$(SNAPSHOT_NAME)/comfyui.tar.zst && \
6967
ossutil cp ./tmp/venv.tar.zst oss://$(OSS_BUCKET)/$(OSS_COMFYUI_BASE_DIR)/snapshots/$(SNAPSHOT_NAME)/venv.tar.zst && \
7068
ossutil cp ./tmp/.funart/dependency_version.txt oss://$(OSS_BUCKET)/$(OSS_COMFYUI_BASE_DIR)/.funart/dependency_version.txt && \
71-
# 将 input 目录从旧基线拷贝到新基线 OSS(源路径不存在时请先调整 OSS_COMFYUI_LEGACY_SEED)
72-
ossutil cp -r oss://$(OSS_BUCKET)/$(OSS_COMFYUI_LEGACY_SEED)/input/ oss://$(OSS_BUCKET)/$(OSS_COMFYUI_BASE_DIR)/input/
69+
# 将 input 目录拷贝到 OSS
70+
ossutil cp -r oss://$(OSS_BUCKET)/v0.3.77-alpha/input/ oss://$(OSS_BUCKET)/$(OSS_COMFYUI_BASE_DIR)/
7371

7472
@rm -rf tmp
7573
@echo "Upload completed successfully"
@@ -100,16 +98,16 @@ upload-deepgpu-base:
10098

10199
@echo "Creating .funart/VERSION.txt..."
102100
@mkdir -p ./tmp/.funart
103-
@echo "0.19.4" > ./tmp/.funart/dependency_version.txt
101+
@echo "1.6.7" > ./tmp/.funart/dependency_version.txt
104102

105103
@echo "Uploading files to OSS..."
106104
ossutil cp -r ./tmp/custom_nodes oss://$(OSS_BUCKET)/$(OSS_COMFYUI_DEEPGPU_BASE_DIR)/custom_nodes && \
107105
ossutil cp ./tmp/comfyui.tar.zst oss://$(OSS_BUCKET)/$(OSS_COMFYUI_DEEPGPU_BASE_DIR)/snapshots/$(SNAPSHOT_NAME)/comfyui.tar.zst && \
108106
ossutil cp ./tmp/venv.tar.zst oss://$(OSS_BUCKET)/$(OSS_COMFYUI_DEEPGPU_BASE_DIR)/snapshots/$(SNAPSHOT_NAME)/venv.tar.zst && \
109107
ossutil cp ./tmp/.funart/dependency_version.txt oss://$(OSS_BUCKET)/$(OSS_COMFYUI_DEEPGPU_BASE_DIR)/.funart/dependency_version.txt && \
110-
# 从旧基线拷贝 input / models 到新 deepgpu 基线路径
111-
ossutil cp -r oss://$(OSS_BUCKET)/$(OSS_COMFYUI_LEGACY_SEED)/input/ oss://$(OSS_BUCKET)/$(OSS_COMFYUI_DEEPGPU_BASE_DIR)/ && \
112-
ossutil cp -r oss://$(OSS_BUCKET)/$(OSS_COMFYUI_LEGACY_SEED)/models/ oss://$(OSS_BUCKET)/$(OSS_COMFYUI_DEEPGPU_BASE_DIR)/
108+
# input 目录拷贝到 OSS 上
109+
ossutil cp -r oss://$(OSS_BUCKET)/v0.3.77-alpha/input/ oss://$(OSS_BUCKET)/$(OSS_COMFYUI_DEEPGPU_BASE_DIR)/ && \
110+
ossutil cp -r oss://$(OSS_BUCKET)/v0.3.77-alpha/models/ oss://$(OSS_BUCKET)/$(OSS_COMFYUI_DEEPGPU_BASE_DIR)/
113111

114112
@rm -rf tmp
115113
@echo "Upload completed successfully"

0 commit comments

Comments
 (0)