diff --git a/deploy/args.json b/deploy/args.json index 3ba1558d27..5c85afe7e6 100644 --- a/deploy/args.json +++ b/deploy/args.json @@ -6,6 +6,9 @@ "fastgpt-plugin": "v0.5.6", "volume-manager": "v0.1", "agent-sandbox-image": "v0.1", + "opensandbox-server": "v0.1.9", + "opensandbox-execd": "v1.0.7", + "opensandbox-egress": "v1.0.3", "aiproxy": "v0.3.5", "aiproxy-pg": "0.8.0-pg15", "mongo": "5.0.32", @@ -26,6 +29,9 @@ "fastgpt-mcp_server": "registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server", "volume-manager": "registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager", "agent-sandbox-image": "registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox", + "opensandbox-server": "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server", + "opensandbox-execd": "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd", + "opensandbox-egress": "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress", "aiproxy": "registry.cn-hangzhou.aliyuncs.com/labring/aiproxy", "aiproxy-pg": "registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector", "mongo": "registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo", @@ -44,6 +50,10 @@ "fastgpt-code-sandbox": "ghcr.io/labring/fastgpt-code-sandbox", "fastgpt-mcp_server": "ghcr.io/labring/fastgpt-mcp_server", "volume-manager": "ghcr.io/labring/fastgpt-agent-volume-manager", + "agent-sandbox-image": "ghcr.io/labring/fastgpt-agent-sandbox", + "opensandbox-server": "opensandbox/server", + "opensandbox-execd": "opensandbox/execd", + "opensandbox-egress": "opensandbox/egress", "aiproxy": "ghcr.io/labring/aiproxy", "aiproxy-pg": "pgvector/pgvector", "mongo": "mongo", diff --git a/deploy/dev/docker-compose.cn.yml b/deploy/dev/docker-compose.cn.yml index ef608dda57..e32d41554e 100644 --- a/deploy/dev/docker-compose.cn.yml +++ b/deploy/dev/docker-compose.cn.yml @@ -6,8 +6,12 @@ # - fastgpt-mongo: 27017 # - fastgpt-redis: 6379 # - fastgpt-code-sandbox: 3002 -# - fastgpt-plugin: 3003 +# - fastgpt-mcp-server: 3003 +# - fastgpt-plugin: 3004 +# - fastgpt-volume-manager: 3005 +# - opensandbox-server: 8090 # - fastgpt-aiproxy: 3010 +# - fastgpt-aiproxy-pg: 5432 # - 使用 pgvector 作为默认的向量库 # plugin auth token @@ -251,7 +255,7 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: + opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always @@ -271,6 +275,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 @@ -299,11 +316,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -375,10 +387,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/dev/docker-compose.yml b/deploy/dev/docker-compose.yml index 742d4d499d..518578e9e0 100644 --- a/deploy/dev/docker-compose.yml +++ b/deploy/dev/docker-compose.yml @@ -6,8 +6,12 @@ # - fastgpt-mongo: 27017 # - fastgpt-redis: 6379 # - fastgpt-code-sandbox: 3002 -# - fastgpt-plugin: 3003 +# - fastgpt-mcp-server: 3003 +# - fastgpt-plugin: 3004 +# - fastgpt-volume-manager: 3005 +# - opensandbox-server: 8090 # - fastgpt-aiproxy: 3010 +# - fastgpt-aiproxy-pg: 5432 # - 使用 pgvector 作为默认的向量库 # plugin auth token @@ -251,8 +255,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: opensandbox/server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always ports: @@ -271,6 +275,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ghcr.io/labring/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: opensandbox/execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: opensandbox/egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 @@ -299,11 +316,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: undefined:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -375,10 +387,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "opensandbox/execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "opensandbox/egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/docker/cn/docker-compose.milvus.yml b/deploy/docker/cn/docker-compose.milvus.yml index 8808976b6a..76332e2b65 100644 --- a/deploy/docker/cn/docker-compose.milvus.yml +++ b/deploy/docker/cn/docker-compose.milvus.yml @@ -240,7 +240,7 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox @@ -330,7 +330,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -362,7 +362,7 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: + opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always @@ -380,6 +380,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 @@ -407,11 +420,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -489,10 +497,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/docker/cn/docker-compose.oceanbase.yml b/deploy/docker/cn/docker-compose.oceanbase.yml index 2aafaf1f7a..759a72b203 100644 --- a/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/deploy/docker/cn/docker-compose.oceanbase.yml @@ -217,7 +217,7 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox @@ -307,7 +307,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -339,7 +339,7 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: + opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always @@ -357,6 +357,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 @@ -384,11 +397,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -466,10 +474,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/docker/cn/docker-compose.pg.yml b/deploy/docker/cn/docker-compose.pg.yml index 5156e72e08..b761e03636 100644 --- a/deploy/docker/cn/docker-compose.pg.yml +++ b/deploy/docker/cn/docker-compose.pg.yml @@ -198,7 +198,7 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox @@ -288,7 +288,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -320,7 +320,7 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: + opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always @@ -338,6 +338,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 @@ -365,11 +378,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -447,10 +455,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/docker/cn/docker-compose.seekdb.yml b/deploy/docker/cn/docker-compose.seekdb.yml index 602baddab5..1b112dce3f 100644 --- a/deploy/docker/cn/docker-compose.seekdb.yml +++ b/deploy/docker/cn/docker-compose.seekdb.yml @@ -204,7 +204,7 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox @@ -294,7 +294,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -326,7 +326,7 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: + opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always @@ -344,6 +344,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 @@ -371,11 +384,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -453,10 +461,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/docker/cn/docker-compose.zilliz.yml b/deploy/docker/cn/docker-compose.zilliz.yml index cf8c9fbd97..81960c44b6 100644 --- a/deploy/docker/cn/docker-compose.zilliz.yml +++ b/deploy/docker/cn/docker-compose.zilliz.yml @@ -180,7 +180,7 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox @@ -270,7 +270,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -302,7 +302,7 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: + opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always @@ -320,6 +320,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 @@ -347,11 +360,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -429,10 +437,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/docker/global/docker-compose.milvus.yml b/deploy/docker/global/docker-compose.milvus.yml index 5afce1f117..8219d3e3f2 100644 --- a/deploy/docker/global/docker-compose.milvus.yml +++ b/deploy/docker/global/docker-compose.milvus.yml @@ -240,10 +240,10 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker - AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined + AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ghcr.io/labring/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置(opensandbox provider 下可选) AGENT_SANDBOX_ENABLE_VOLUME: true @@ -330,7 +330,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -362,8 +362,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: opensandbox/server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always networks: @@ -380,6 +380,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ghcr.io/labring/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: opensandbox/execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: opensandbox/egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 @@ -407,11 +420,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: undefined:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -489,10 +497,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "opensandbox/execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "opensandbox/egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/docker/global/docker-compose.oceanbase.yml b/deploy/docker/global/docker-compose.oceanbase.yml index 475747447a..7b2e5e2205 100644 --- a/deploy/docker/global/docker-compose.oceanbase.yml +++ b/deploy/docker/global/docker-compose.oceanbase.yml @@ -217,10 +217,10 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker - AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined + AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ghcr.io/labring/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置(opensandbox provider 下可选) AGENT_SANDBOX_ENABLE_VOLUME: true @@ -307,7 +307,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -339,8 +339,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: opensandbox/server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always networks: @@ -357,6 +357,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ghcr.io/labring/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: opensandbox/execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: opensandbox/egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 @@ -384,11 +397,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: undefined:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -466,10 +474,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "opensandbox/execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "opensandbox/egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/docker/global/docker-compose.pg.yml b/deploy/docker/global/docker-compose.pg.yml index d6047f2564..f5300bbd51 100644 --- a/deploy/docker/global/docker-compose.pg.yml +++ b/deploy/docker/global/docker-compose.pg.yml @@ -198,10 +198,10 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker - AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined + AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ghcr.io/labring/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置(opensandbox provider 下可选) AGENT_SANDBOX_ENABLE_VOLUME: true @@ -288,7 +288,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -320,8 +320,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: opensandbox/server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always networks: @@ -338,6 +338,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ghcr.io/labring/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: opensandbox/execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: opensandbox/egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 @@ -365,11 +378,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: undefined:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -447,10 +455,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "opensandbox/execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "opensandbox/egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/docker/global/docker-compose.seekdb.yml b/deploy/docker/global/docker-compose.seekdb.yml index 8317e136af..e2fb7ee3a4 100644 --- a/deploy/docker/global/docker-compose.seekdb.yml +++ b/deploy/docker/global/docker-compose.seekdb.yml @@ -204,10 +204,10 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker - AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined + AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ghcr.io/labring/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置(opensandbox provider 下可选) AGENT_SANDBOX_ENABLE_VOLUME: true @@ -294,7 +294,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -326,8 +326,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: opensandbox/server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always networks: @@ -344,6 +344,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ghcr.io/labring/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: opensandbox/execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: opensandbox/egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 @@ -371,11 +384,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: undefined:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -453,10 +461,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "opensandbox/execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "opensandbox/egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/docker/global/docker-compose.ziliiz.yml b/deploy/docker/global/docker-compose.ziliiz.yml index cee5282a20..1d436ed6a0 100644 --- a/deploy/docker/global/docker-compose.ziliiz.yml +++ b/deploy/docker/global/docker-compose.ziliiz.yml @@ -180,10 +180,10 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker - AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined + AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ghcr.io/labring/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置(opensandbox provider 下可选) AGENT_SANDBOX_ENABLE_VOLUME: true @@ -270,7 +270,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -302,8 +302,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: opensandbox/server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always networks: @@ -320,6 +320,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ghcr.io/labring/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: opensandbox/execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: opensandbox/egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 @@ -347,11 +360,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: undefined:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -429,10 +437,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "opensandbox/execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "opensandbox/egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/deploy/templates/docker-compose.dev.yml b/deploy/templates/docker-compose.dev.yml index 3a95972cfe..4809ef37f7 100644 --- a/deploy/templates/docker-compose.dev.yml +++ b/deploy/templates/docker-compose.dev.yml @@ -6,8 +6,12 @@ # - fastgpt-mongo: 27017 # - fastgpt-redis: 6379 # - fastgpt-code-sandbox: 3002 -# - fastgpt-plugin: 3003 +# - fastgpt-mcp-server: 3003 +# - fastgpt-plugin: 3004 +# - fastgpt-volume-manager: 3005 +# - opensandbox-server: 8090 # - fastgpt-aiproxy: 3010 +# - fastgpt-aiproxy-pg: 5432 # - 使用 pgvector 作为默认的向量库 # plugin auth token @@ -251,8 +255,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: ${{opensandbox-server.image}}:${{opensandbox-server.tag}} container_name: fastgpt-opensandbox-server restart: always ports: @@ -271,6 +275,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ${{agent-sandbox-image.image}}:${{agent-sandbox-image.tag}} + profiles: + - prepull + opensandbox-execd-image: + image: ${{opensandbox-execd.image}}:${{opensandbox-execd.tag}} + profiles: + - prepull + opensandbox-egress-image: + image: ${{opensandbox-egress.image}}:${{opensandbox-egress.tag}} + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ${{volume-manager.image}}:${{volume-manager.tag}} @@ -299,11 +316,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: ${{agent-sandbox-image.image}}:${{agent-sandbox-image.tag}} - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -375,10 +387,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "${{opensandbox-execd.image}}:${{opensandbox-execd.tag}}" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "${{opensandbox-egress.image}}:${{opensandbox-egress.tag}}" [docker] network_mode = "bridge" diff --git a/deploy/templates/docker-compose.prod.yml b/deploy/templates/docker-compose.prod.yml index 9da679db47..5d3eac78e1 100644 --- a/deploy/templates/docker-compose.prod.yml +++ b/deploy/templates/docker-compose.prod.yml @@ -179,7 +179,7 @@ ${{vec.dependsOn}} # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ${{agent-sandbox-image.image}} @@ -269,7 +269,7 @@ ${{vec.dependsOn}} networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -301,8 +301,8 @@ ${{vec.dependsOn}} # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: ${{opensandbox-server.image}}:${{opensandbox-server.tag}} container_name: fastgpt-opensandbox-server restart: always networks: @@ -319,6 +319,19 @@ ${{vec.dependsOn}} interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ${{agent-sandbox-image.image}}:${{agent-sandbox-image.tag}} + profiles: + - prepull + opensandbox-execd-image: + image: ${{opensandbox-execd.image}}:${{opensandbox-execd.tag}} + profiles: + - prepull + opensandbox-egress-image: + image: ${{opensandbox-egress.image}}:${{opensandbox-egress.tag}} + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ${{volume-manager.image}}:${{volume-manager.tag}} @@ -346,11 +359,6 @@ ${{vec.dependsOn}} interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: ${{agent-sandbox-image.image}}:${{agent-sandbox-image.tag}} - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -428,10 +436,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "${{opensandbox-execd.image}}:${{opensandbox-execd.tag}}" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "${{opensandbox-egress.image}}:${{opensandbox-egress.tag}}" [docker] network_mode = "bridge" diff --git a/document/content/docs/self-host/deploy/docker.en.mdx b/document/content/docs/self-host/deploy/docker.en.mdx index f821e33a87..2831063ef9 100644 --- a/document/content/docs/self-host/deploy/docker.en.mdx +++ b/document/content/docs/self-host/deploy/docker.en.mdx @@ -173,7 +173,7 @@ Run in the same directory as docker-compose.yml. Ensure `docker-compose` version ```bash # Start containers -docker compose --profile prepull pull agent-sandbox-image && docker compose up -d +docker compose --profile prepull pull agent-sandbox-image opensandbox-execd-image opensandbox-egress-image && docker compose up -d ``` ### 5. Access FastGPT diff --git a/document/content/docs/self-host/deploy/docker.mdx b/document/content/docs/self-host/deploy/docker.mdx index 4c6eebd99f..0881512bc5 100644 --- a/document/content/docs/self-host/deploy/docker.mdx +++ b/document/content/docs/self-host/deploy/docker.mdx @@ -173,7 +173,7 @@ bash <(curl -fsSL https://doc.fastgpt.cn/deploy/install.sh) ```bash # 启动容器 -docker compose --profile prepull pull agent-sandbox-image && docker compose up -d +docker compose --profile prepull pull agent-sandbox-image opensandbox-execd-image opensandbox-egress-image && dockercompose up -d ``` diff --git a/document/public/deploy/docker/cn/docker-compose.milvus.yml b/document/public/deploy/docker/cn/docker-compose.milvus.yml index 8808976b6a..76332e2b65 100644 --- a/document/public/deploy/docker/cn/docker-compose.milvus.yml +++ b/document/public/deploy/docker/cn/docker-compose.milvus.yml @@ -240,7 +240,7 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox @@ -330,7 +330,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -362,7 +362,7 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: + opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always @@ -380,6 +380,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 @@ -407,11 +420,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -489,10 +497,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml index 2aafaf1f7a..759a72b203 100644 --- a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml @@ -217,7 +217,7 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox @@ -307,7 +307,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -339,7 +339,7 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: + opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always @@ -357,6 +357,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 @@ -384,11 +397,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -466,10 +474,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/document/public/deploy/docker/cn/docker-compose.pg.yml b/document/public/deploy/docker/cn/docker-compose.pg.yml index 5156e72e08..b761e03636 100644 --- a/document/public/deploy/docker/cn/docker-compose.pg.yml +++ b/document/public/deploy/docker/cn/docker-compose.pg.yml @@ -198,7 +198,7 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox @@ -288,7 +288,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -320,7 +320,7 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: + opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always @@ -338,6 +338,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 @@ -365,11 +378,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -447,10 +455,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/document/public/deploy/docker/cn/docker-compose.seekdb.yml b/document/public/deploy/docker/cn/docker-compose.seekdb.yml index 602baddab5..1b112dce3f 100644 --- a/document/public/deploy/docker/cn/docker-compose.seekdb.yml +++ b/document/public/deploy/docker/cn/docker-compose.seekdb.yml @@ -204,7 +204,7 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox @@ -294,7 +294,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -326,7 +326,7 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: + opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always @@ -344,6 +344,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 @@ -371,11 +384,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -453,10 +461,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/document/public/deploy/docker/cn/docker-compose.zilliz.yml b/document/public/deploy/docker/cn/docker-compose.zilliz.yml index cf8c9fbd97..81960c44b6 100644 --- a/document/public/deploy/docker/cn/docker-compose.zilliz.yml +++ b/document/public/deploy/docker/cn/docker-compose.zilliz.yml @@ -180,7 +180,7 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox @@ -270,7 +270,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -302,7 +302,7 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: + opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always @@ -320,6 +320,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 @@ -347,11 +360,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -429,10 +437,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/document/public/deploy/docker/global/docker-compose.milvus.yml b/document/public/deploy/docker/global/docker-compose.milvus.yml index 5afce1f117..8219d3e3f2 100644 --- a/document/public/deploy/docker/global/docker-compose.milvus.yml +++ b/document/public/deploy/docker/global/docker-compose.milvus.yml @@ -240,10 +240,10 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker - AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined + AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ghcr.io/labring/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置(opensandbox provider 下可选) AGENT_SANDBOX_ENABLE_VOLUME: true @@ -330,7 +330,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -362,8 +362,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: opensandbox/server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always networks: @@ -380,6 +380,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ghcr.io/labring/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: opensandbox/execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: opensandbox/egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 @@ -407,11 +420,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: undefined:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -489,10 +497,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "opensandbox/execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "opensandbox/egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/document/public/deploy/docker/global/docker-compose.oceanbase.yml b/document/public/deploy/docker/global/docker-compose.oceanbase.yml index 475747447a..7b2e5e2205 100644 --- a/document/public/deploy/docker/global/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/global/docker-compose.oceanbase.yml @@ -217,10 +217,10 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker - AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined + AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ghcr.io/labring/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置(opensandbox provider 下可选) AGENT_SANDBOX_ENABLE_VOLUME: true @@ -307,7 +307,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -339,8 +339,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: opensandbox/server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always networks: @@ -357,6 +357,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ghcr.io/labring/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: opensandbox/execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: opensandbox/egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 @@ -384,11 +397,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: undefined:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -466,10 +474,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "opensandbox/execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "opensandbox/egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/document/public/deploy/docker/global/docker-compose.pg.yml b/document/public/deploy/docker/global/docker-compose.pg.yml index d6047f2564..f5300bbd51 100644 --- a/document/public/deploy/docker/global/docker-compose.pg.yml +++ b/document/public/deploy/docker/global/docker-compose.pg.yml @@ -198,10 +198,10 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker - AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined + AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ghcr.io/labring/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置(opensandbox provider 下可选) AGENT_SANDBOX_ENABLE_VOLUME: true @@ -288,7 +288,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -320,8 +320,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: opensandbox/server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always networks: @@ -338,6 +338,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ghcr.io/labring/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: opensandbox/execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: opensandbox/egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 @@ -365,11 +378,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: undefined:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -447,10 +455,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "opensandbox/execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "opensandbox/egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/document/public/deploy/docker/global/docker-compose.seekdb.yml b/document/public/deploy/docker/global/docker-compose.seekdb.yml index 8317e136af..e2fb7ee3a4 100644 --- a/document/public/deploy/docker/global/docker-compose.seekdb.yml +++ b/document/public/deploy/docker/global/docker-compose.seekdb.yml @@ -204,10 +204,10 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker - AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined + AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ghcr.io/labring/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置(opensandbox provider 下可选) AGENT_SANDBOX_ENABLE_VOLUME: true @@ -294,7 +294,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -326,8 +326,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: opensandbox/server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always networks: @@ -344,6 +344,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ghcr.io/labring/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: opensandbox/execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: opensandbox/egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 @@ -371,11 +384,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: undefined:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -453,10 +461,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "opensandbox/execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "opensandbox/egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/document/public/deploy/docker/global/docker-compose.ziliiz.yml b/document/public/deploy/docker/global/docker-compose.ziliiz.yml index cee5282a20..1d436ed6a0 100644 --- a/document/public/deploy/docker/global/docker-compose.ziliiz.yml +++ b/document/public/deploy/docker/global/docker-compose.ziliiz.yml @@ -180,10 +180,10 @@ services: # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置(PROVIDER: opensandbox 时生效) - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker - AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined + AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ghcr.io/labring/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置(opensandbox provider 下可选) AGENT_SANDBOX_ENABLE_VOLUME: true @@ -270,7 +270,7 @@ services: networks: - fastgpt ports: - - 3005:3000 + - 3003:3000 restart: always environment: <<: [*x-log-config] @@ -302,8 +302,8 @@ services: # 沙盒控制器:管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) - fastgpt-opensandbox-server: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 + opensandbox-server: + image: opensandbox/server:v0.1.9 container_name: fastgpt-opensandbox-server restart: always networks: @@ -320,6 +320,19 @@ services: interval: 10s timeout: 5s retries: 5 + # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). + opensandbox-agent-sandbox-image: + image: ghcr.io/labring/fastgpt-agent-sandbox:v0.1 + profiles: + - prepull + opensandbox-execd-image: + image: opensandbox/execd:v1.0.7 + profiles: + - prepull + opensandbox-egress-image: + image: opensandbox/egress:v1.0.3 + profiles: + - prepull # 卷管理微服务:负责幂等创建/删除 Docker named volume 或 k8s PVC fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 @@ -347,11 +360,6 @@ services: interval: 10s timeout: 5s retries: 5 - # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - fastgpt-agent-sandbox-image: - image: undefined:v0.1 - profiles: - - prepull # AI Proxy fastgpt-aiproxy: @@ -429,10 +437,10 @@ configs: [runtime] type = "docker" - execd_image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/execd:v1.0.6" + execd_image = "opensandbox/execd:v1.0.7" [egress] - image = "sandbox-registry.cn-zhangjiakou.cr.aliyuncs.com/opensandbox/egress:v1.0.1" + image = "opensandbox/egress:v1.0.3" [docker] network_mode = "bridge" diff --git a/document/public/deploy/install.sh b/document/public/deploy/install.sh index 748c7fdf55..1ba5e57650 100644 --- a/document/public/deploy/install.sh +++ b/document/public/deploy/install.sh @@ -293,7 +293,7 @@ fi # ========== 完成 ========== echo "" echo "配置下载成功! 后续操作:" -echo " 1. 预热沙盒: docker compose --profile prepull pull agent-sandbox-image" +echo " 1. 预热沙盒: docker compose --profile prepull pull opensandbox-agent-sandbox-image opensandbox-execd-image opensandbox-egress-image" echo " 2. 启动服务: docker compose up -d" echo " 3. 开放端口: 3000, 9000, 3003" echo " 4. 访问服务: http://localhost:3000" diff --git a/projects/app/.env.template b/projects/app/.env.template index e1c581b91b..d9ce1c5222 100644 --- a/projects/app/.env.template +++ b/projects/app/.env.template @@ -45,7 +45,7 @@ AGENT_SANDBOX_OPENSANDBOX_BASEURL=http://localhost:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY= AGENT_SANDBOX_OPENSANDBOX_RUNTIME=docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO=registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox -AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG=v0.0.2 +AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG=v0.1 # Volume 持久化配置(opensandbox provider 下可选) AGENT_SANDBOX_ENABLE_VOLUME=true AGENT_SANDBOX_VOLUME_MANAGER_URL=http://localhost:3005