功能:executor 镜像分层(基础 M + 技能系统层派生镜像)+ 启动前 skills 初始化
- executor/Dockerfile 改多阶段:base 为基础镜像 M(长期不变,系统工具 + 预烘 Python 包);skills 阶段 = M + 技能系统层依赖(构建期跑各 install.sh,apt 等系统包持久且对命令只读)。build context 改为仓库根,用 .dockerignore 只放行 executor/ 与 skills/。 - 新增 agent-executor-init 一次性服务(executor/init-skills.js,与 core ensureDeps 同 hash/marker 格式):启动前把 requirements.txt(pip --target 共享 deps)与 install.sh 资产落到宿主 ./skills;只挂 ./skills、无特权、read_only,跑完退出;executor depends_on service_completed_successfully。 - 运行期 skills 仍 :ro;M 不变、skills 可变、命令写不了共享系统层,会话隔离保持。 - 实测:构建 stage 两个 install.sh 正常;init 幂等跳过/按需重跑(install.sh 与 pip 分支各验一次);executor 重建后 ReadonlyRootfs=true、/run tmpfs、core 到 executor 健康、run_skill 端到端正常。docs/ARCHITECTURE.md 与 skills/README.md 同步。
This commit is contained in:
+36
-1
@@ -26,10 +26,45 @@ services:
|
||||
- my-app-network
|
||||
- agent-internal
|
||||
|
||||
# 技能准备(一次性,跑完退出):把各技能的“运行期可变”依赖落到宿主 ./skills——
|
||||
# requirements.txt → pip --target 共享 deps 目录;install.sh → 技能资产(如字体提取)。
|
||||
# 系统层依赖(apt 等)不在这里做,由镜像的 skills 构建阶段烘进(才持久且对命令只读)。
|
||||
# 只挂 ./skills(不挂 ./tasks),因此看不到任何会话数据;read_only 根 + tmpfs /tmp。
|
||||
agent-executor-init:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: executor/Dockerfile
|
||||
target: skills
|
||||
image: agent-agent-executor-skills
|
||||
container_name: agent-executor-init
|
||||
restart: "no"
|
||||
command: ["node", "init-skills.js"]
|
||||
read_only: true
|
||||
tmpfs:
|
||||
- /tmp
|
||||
volumes:
|
||||
- ./skills:/workspace/skills
|
||||
environment:
|
||||
- HOME=/tmp
|
||||
- TMPDIR=/tmp
|
||||
- PYTHONDONTWRITEBYTECODE=1
|
||||
- TZ=Asia/Shanghai
|
||||
networks:
|
||||
- agent-internal
|
||||
|
||||
agent-executor:
|
||||
build: ./executor
|
||||
# M' = M + 技能系统层依赖(executor/Dockerfile 的 skills 阶段)。
|
||||
# 管理员增删/改动 skills 后:docker compose build agent-executor 重建这层,M 不动。
|
||||
build:
|
||||
context: .
|
||||
dockerfile: executor/Dockerfile
|
||||
target: skills
|
||||
image: agent-agent-executor-skills
|
||||
container_name: agent-executor
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
agent-executor-init:
|
||||
condition: service_completed_successfully
|
||||
expose:
|
||||
- "9000"
|
||||
volumes:
|
||||
|
||||
Reference in New Issue
Block a user