diff --git a/deploy/docker/cn/docker-compose.milvus.yml b/deploy/docker/cn/docker-compose.milvus.yml index a6b659bb57..cd51d3fbad 100644 --- a/deploy/docker/cn/docker-compose.milvus.yml +++ b/deploy/docker/cn/docker-compose.milvus.yml @@ -193,7 +193,7 @@ services: fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -362,9 +362,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -373,7 +375,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -389,10 +391,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -458,6 +460,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/deploy/docker/cn/docker-compose.oceanbase.yml b/deploy/docker/cn/docker-compose.oceanbase.yml index d428758264..8adeb2c3db 100644 --- a/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/deploy/docker/cn/docker-compose.oceanbase.yml @@ -170,7 +170,7 @@ services: fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -339,9 +339,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -350,7 +352,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -366,10 +368,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -435,6 +437,11 @@ networks: vector: configs: + init_sql: + name: init_sql + content: | + ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30; + opensandbox-config: content: | [server] diff --git a/deploy/docker/cn/docker-compose.pg.yml b/deploy/docker/cn/docker-compose.pg.yml index 5a6003378a..a1d9aa448b 100644 --- a/deploy/docker/cn/docker-compose.pg.yml +++ b/deploy/docker/cn/docker-compose.pg.yml @@ -151,7 +151,7 @@ services: fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -320,9 +320,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -331,7 +333,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -347,10 +349,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -416,6 +418,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/deploy/docker/cn/docker-compose.seekdb.yml b/deploy/docker/cn/docker-compose.seekdb.yml index d259d7ff11..ee6b8bb97b 100644 --- a/deploy/docker/cn/docker-compose.seekdb.yml +++ b/deploy/docker/cn/docker-compose.seekdb.yml @@ -157,7 +157,7 @@ services: fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -326,9 +326,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -337,7 +339,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -353,10 +355,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -422,6 +424,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/deploy/docker/cn/docker-compose.zilliz.yml b/deploy/docker/cn/docker-compose.zilliz.yml index c284593cd9..91f565fa28 100644 --- a/deploy/docker/cn/docker-compose.zilliz.yml +++ b/deploy/docker/cn/docker-compose.zilliz.yml @@ -135,7 +135,7 @@ services: fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -304,9 +304,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -315,7 +317,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -331,10 +333,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -400,6 +402,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/deploy/docker/global/docker-compose.milvus.yml b/deploy/docker/global/docker-compose.milvus.yml index b7d5896cba..04bc461c52 100644 --- a/deploy/docker/global/docker-compose.milvus.yml +++ b/deploy/docker/global/docker-compose.milvus.yml @@ -193,7 +193,7 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.14.9.5 # git + image: ghcr.io/labring/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -362,9 +362,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -373,7 +375,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -389,10 +391,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -458,6 +460,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/deploy/docker/global/docker-compose.oceanbase.yml b/deploy/docker/global/docker-compose.oceanbase.yml index bc3e43a4c0..cba7830532 100644 --- a/deploy/docker/global/docker-compose.oceanbase.yml +++ b/deploy/docker/global/docker-compose.oceanbase.yml @@ -170,7 +170,7 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.14.9.5 # git + image: ghcr.io/labring/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -339,9 +339,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -350,7 +352,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -366,10 +368,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -435,6 +437,11 @@ networks: vector: configs: + init_sql: + name: init_sql + content: | + ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30; + opensandbox-config: content: | [server] diff --git a/deploy/docker/global/docker-compose.pg.yml b/deploy/docker/global/docker-compose.pg.yml index 1d7c1fd3ad..adcaec4324 100644 --- a/deploy/docker/global/docker-compose.pg.yml +++ b/deploy/docker/global/docker-compose.pg.yml @@ -151,7 +151,7 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.14.9.5 # git + image: ghcr.io/labring/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -320,9 +320,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -331,7 +333,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -347,10 +349,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -416,6 +418,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/deploy/docker/global/docker-compose.seekdb.yml b/deploy/docker/global/docker-compose.seekdb.yml index 257620abb5..2a62e156f4 100644 --- a/deploy/docker/global/docker-compose.seekdb.yml +++ b/deploy/docker/global/docker-compose.seekdb.yml @@ -157,7 +157,7 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.14.9.5 # git + image: ghcr.io/labring/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -326,9 +326,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -337,7 +339,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -353,10 +355,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -422,6 +424,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/deploy/docker/global/docker-compose.ziliiz.yml b/deploy/docker/global/docker-compose.ziliiz.yml index 4c6f3d3e75..ce939d3f06 100644 --- a/deploy/docker/global/docker-compose.ziliiz.yml +++ b/deploy/docker/global/docker-compose.ziliiz.yml @@ -135,7 +135,7 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.14.9.5 # git + image: ghcr.io/labring/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -304,9 +304,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -315,7 +317,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -331,10 +333,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -400,6 +402,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/deploy/init.mjs b/deploy/init.mjs index 0b73c1ccfb..ae5d38b8b0 100644 --- a/deploy/init.mjs +++ b/deploy/init.mjs @@ -79,8 +79,7 @@ const vector = { OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/mysql `, extra: `\ -configs: - init_sql: +init_sql: name: init_sql content: | ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30; diff --git a/deploy/templates/docker-compose.prod.yml b/deploy/templates/docker-compose.prod.yml index d6c94f8a2c..11989815b4 100644 --- a/deploy/templates/docker-compose.prod.yml +++ b/deploy/templates/docker-compose.prod.yml @@ -303,9 +303,11 @@ ${{vec.db}} # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -314,7 +316,7 @@ ${{vec.db}} - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -330,10 +332,10 @@ ${{vec.db}} volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -399,6 +401,7 @@ networks: vector: configs: + ${{vec.extra}} opensandbox-config: content: | [server] diff --git a/document/content/docs/self-host/upgrading/4-14/41410.mdx b/document/content/docs/self-host/upgrading/4-14/41410.mdx index 999cb23ba4..d2a4d88584 100644 --- a/document/content/docs/self-host/upgrading/4-14/41410.mdx +++ b/document/content/docs/self-host/upgrading/4-14/41410.mdx @@ -10,12 +10,12 @@ description: 'FastGPT V4.14.10 更新说明' ## 升级指南 -### 1. 增加沙盒配置 +### 1. ## 🚀 新增内容 -1. 增加 OpenSandbox docker 部署方案及适配,并支持通过挂载 volumn 进行数据持久化。 +1. 增加 OpenSandbox docker 部署方案及适配,并支持通过挂载 volume 进行数据持久化。 2. 新增沙盒读取文件链接工具,可以直接让 AI 返回文件的访问链接。 3. 飞书发布渠道,支持流输出。 4. 目录最大上限,可通过环境变量配置。 diff --git a/document/data/doc-last-modified.json b/document/data/doc-last-modified.json index 27b5d629f9..a218b2d594 100644 --- a/document/data/doc-last-modified.json +++ b/document/data/doc-last-modified.json @@ -220,7 +220,7 @@ "document/content/docs/self-host/upgrading/4-14/4140.mdx": "2026-03-03T17:39:47+08:00", "document/content/docs/self-host/upgrading/4-14/4141.en.mdx": "2026-03-03T17:39:47+08:00", "document/content/docs/self-host/upgrading/4-14/4141.mdx": "2026-03-03T17:39:47+08:00", - "document/content/docs/self-host/upgrading/4-14/41410.mdx": "2026-03-31T17:02:56+08:00", + "document/content/docs/self-host/upgrading/4-14/41410.mdx": "2026-03-31T20:51:20+08:00", "document/content/docs/self-host/upgrading/4-14/4142.en.mdx": "2026-03-03T17:39:47+08:00", "document/content/docs/self-host/upgrading/4-14/4142.mdx": "2026-03-03T17:39:47+08:00", "document/content/docs/self-host/upgrading/4-14/4143.en.mdx": "2026-03-03T17:39:47+08:00", diff --git a/document/public/deploy/docker/cn/docker-compose.milvus.yml b/document/public/deploy/docker/cn/docker-compose.milvus.yml index a6b659bb57..cd51d3fbad 100644 --- a/document/public/deploy/docker/cn/docker-compose.milvus.yml +++ b/document/public/deploy/docker/cn/docker-compose.milvus.yml @@ -193,7 +193,7 @@ services: fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -362,9 +362,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -373,7 +375,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -389,10 +391,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -458,6 +460,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml index d428758264..8adeb2c3db 100644 --- a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml @@ -170,7 +170,7 @@ services: fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -339,9 +339,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -350,7 +352,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -366,10 +368,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -435,6 +437,11 @@ networks: vector: configs: + init_sql: + name: init_sql + content: | + ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30; + opensandbox-config: content: | [server] diff --git a/document/public/deploy/docker/cn/docker-compose.pg.yml b/document/public/deploy/docker/cn/docker-compose.pg.yml index 5a6003378a..a1d9aa448b 100644 --- a/document/public/deploy/docker/cn/docker-compose.pg.yml +++ b/document/public/deploy/docker/cn/docker-compose.pg.yml @@ -151,7 +151,7 @@ services: fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -320,9 +320,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -331,7 +333,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -347,10 +349,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -416,6 +418,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/document/public/deploy/docker/cn/docker-compose.seekdb.yml b/document/public/deploy/docker/cn/docker-compose.seekdb.yml index d259d7ff11..ee6b8bb97b 100644 --- a/document/public/deploy/docker/cn/docker-compose.seekdb.yml +++ b/document/public/deploy/docker/cn/docker-compose.seekdb.yml @@ -157,7 +157,7 @@ services: fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -326,9 +326,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -337,7 +339,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -353,10 +355,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -422,6 +424,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/document/public/deploy/docker/cn/docker-compose.zilliz.yml b/document/public/deploy/docker/cn/docker-compose.zilliz.yml index c284593cd9..91f565fa28 100644 --- a/document/public/deploy/docker/cn/docker-compose.zilliz.yml +++ b/document/public/deploy/docker/cn/docker-compose.zilliz.yml @@ -135,7 +135,7 @@ services: fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -304,9 +304,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -315,7 +317,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -331,10 +333,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -400,6 +402,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/document/public/deploy/docker/global/docker-compose.milvus.yml b/document/public/deploy/docker/global/docker-compose.milvus.yml index b7d5896cba..04bc461c52 100644 --- a/document/public/deploy/docker/global/docker-compose.milvus.yml +++ b/document/public/deploy/docker/global/docker-compose.milvus.yml @@ -193,7 +193,7 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.14.9.5 # git + image: ghcr.io/labring/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -362,9 +362,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -373,7 +375,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -389,10 +391,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -458,6 +460,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/document/public/deploy/docker/global/docker-compose.oceanbase.yml b/document/public/deploy/docker/global/docker-compose.oceanbase.yml index bc3e43a4c0..cba7830532 100644 --- a/document/public/deploy/docker/global/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/global/docker-compose.oceanbase.yml @@ -170,7 +170,7 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.14.9.5 # git + image: ghcr.io/labring/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -339,9 +339,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -350,7 +352,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -366,10 +368,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -435,6 +437,11 @@ networks: vector: configs: + init_sql: + name: init_sql + content: | + ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30; + opensandbox-config: content: | [server] diff --git a/document/public/deploy/docker/global/docker-compose.pg.yml b/document/public/deploy/docker/global/docker-compose.pg.yml index 1d7c1fd3ad..adcaec4324 100644 --- a/document/public/deploy/docker/global/docker-compose.pg.yml +++ b/document/public/deploy/docker/global/docker-compose.pg.yml @@ -151,7 +151,7 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.14.9.5 # git + image: ghcr.io/labring/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -320,9 +320,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -331,7 +333,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -347,10 +349,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -416,6 +418,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/document/public/deploy/docker/global/docker-compose.seekdb.yml b/document/public/deploy/docker/global/docker-compose.seekdb.yml index 257620abb5..2a62e156f4 100644 --- a/document/public/deploy/docker/global/docker-compose.seekdb.yml +++ b/document/public/deploy/docker/global/docker-compose.seekdb.yml @@ -157,7 +157,7 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.14.9.5 # git + image: ghcr.io/labring/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -326,9 +326,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -337,7 +339,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -353,10 +355,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -422,6 +424,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/document/public/deploy/docker/global/docker-compose.ziliiz.yml b/document/public/deploy/docker/global/docker-compose.ziliiz.yml index 4c6f3d3e75..ce939d3f06 100644 --- a/document/public/deploy/docker/global/docker-compose.ziliiz.yml +++ b/document/public/deploy/docker/global/docker-compose.ziliiz.yml @@ -135,7 +135,7 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.14.9.5 # git + image: ghcr.io/labring/fastgpt:v4.14.9.5 ports: - 3000:3000 networks: @@ -304,9 +304,11 @@ services: # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP(容器内访问宿主机服务用) opensandbox-server: - image: opensandbox/server:v0.1.9 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 container_name: opensandbox-server restart: always + ports: # 生产环境建议不要暴露 + - 8090:8090 networks: - fastgpt volumes: @@ -315,7 +317,7 @@ services: - source: opensandbox-config target: /etc/opensandbox/config.toml environment: - - SANDBOX_CONFIG_PATH=/etc/opensandbox/config.toml + SANDBOX_CONFIG_PATH: /etc/opensandbox/config.toml healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:8090/health'] interval: 10s @@ -331,10 +333,10 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro # Docker 模式必须挂载(只读即可) environment: - - VM_RUNTIME=docker - - VM_AUTH_TOKEN=*x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN - - VM_VOLUME_NAME_PREFIX=fastgpt-session # volume 名称前缀 - - VM_LOG_LEVEL=info + VM_RUNTIME: docker + VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN + VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 + VM_LOG_LEVEL: info healthcheck: test: [ @@ -400,6 +402,7 @@ networks: vector: configs: + opensandbox-config: content: | [server] diff --git a/projects/app/src/pageComponents/app/detail/Edit/ChatAgent/EditForm.tsx b/projects/app/src/pageComponents/app/detail/Edit/ChatAgent/EditForm.tsx index 9b853482f8..5dcfe2495d 100644 --- a/projects/app/src/pageComponents/app/detail/Edit/ChatAgent/EditForm.tsx +++ b/projects/app/src/pageComponents/app/detail/Edit/ChatAgent/EditForm.tsx @@ -61,7 +61,7 @@ const EditForm = ({ const { t } = useTranslation(); const { feConfigs } = useSystemStore(); const { teamPlanStatus } = useUserStore(); - const enableSandbox = teamPlanStatus?.standard?.enableSandbox; + const enableSandbox = !teamPlanStatus?.standard || !!teamPlanStatus?.standard?.enableSandbox; const showSandbox = feConfigs.show_agent_sandbox; const selectDatasets = useMemo(() => appForm?.dataset?.datasets, [appForm]); diff --git a/projects/app/src/pageComponents/app/detail/Edit/SimpleApp/EditForm.tsx b/projects/app/src/pageComponents/app/detail/Edit/SimpleApp/EditForm.tsx index d38dd4a76b..c50fdfd6dc 100644 --- a/projects/app/src/pageComponents/app/detail/Edit/SimpleApp/EditForm.tsx +++ b/projects/app/src/pageComponents/app/detail/Edit/SimpleApp/EditForm.tsx @@ -74,7 +74,7 @@ const EditForm = ({ const { defaultModels, feConfigs } = useSystemStore(); const showSandbox = feConfigs.show_agent_sandbox; const { teamPlanStatus } = useUserStore(); - const enableSandbox = !teamPlanStatus || !!teamPlanStatus?.standard?.enableSandbox; + const enableSandbox = !teamPlanStatus?.standard || !!teamPlanStatus?.standard?.enableSandbox; const { appDetail } = useContextSelector(AppContext, (v) => v); const selectDatasets = useMemo(() => appForm?.dataset?.datasets, [appForm]); const [, startTst] = useTransition(); diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/index.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/index.tsx index 7575192104..9f329b2d6f 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/index.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/index.tsx @@ -105,7 +105,7 @@ type Props = { const RenderInput = ({ flowInputList, nodeId, CustomComponent, mb = 5 }: Props) => { const { feConfigs } = useSystemStore(); const { teamPlanStatus } = useUserStore(); - const enableSandbox = teamPlanStatus?.standard?.enableSandbox; + const enableSandbox = !teamPlanStatus?.standard || !!teamPlanStatus?.standard?.enableSandbox; const showSandbox = feConfigs.show_agent_sandbox; const filterProInputs = useMemoEnhance(() => { diff --git a/projects/volume-manager/.env.template b/projects/volume-manager/.env.template index a0ae955a26..9922ea3a88 100644 --- a/projects/volume-manager/.env.template +++ b/projects/volume-manager/.env.template @@ -1,5 +1,5 @@ # 服务监听端口 -VM_PORT=3000 +PORT=3000 # 复制为 .env 后修改 # 鉴权 Token(必填),FastGPT 侧对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN diff --git a/projects/volume-manager/src/env.ts b/projects/volume-manager/src/env.ts index 57e072c209..713b4e5474 100644 --- a/projects/volume-manager/src/env.ts +++ b/projects/volume-manager/src/env.ts @@ -1,6 +1,7 @@ import { z } from 'zod'; const schema = z.object({ + PORT: z.coerce.number().default(3000), VM_AUTH_TOKEN: z.string().min(1), VM_RUNTIME: z.enum(['docker', 'kubernetes']).default('kubernetes'), VM_DOCKER_SOCKET: z.string().default('/var/run/docker.sock'), @@ -8,7 +9,6 @@ const schema = z.object({ VM_K8S_PVC_STORAGE_CLASS: z.string().default('standard'), VM_K8S_PVC_STORAGE_SIZE: z.string().default('1Gi'), VM_VOLUME_NAME_PREFIX: z.string().default('fastgpt-session'), - VM_PORT: z.coerce.number().default(3001), VM_LOG_LEVEL: z.enum(['debug', 'info', 'none']).default('info') }); diff --git a/projects/volume-manager/src/index.ts b/projects/volume-manager/src/index.ts index d2d2444b13..de70644297 100644 --- a/projects/volume-manager/src/index.ts +++ b/projects/volume-manager/src/index.ts @@ -27,7 +27,7 @@ app.use('/v1/*', async (c, next) => { app.route('/v1/volumes', volumeRoutes(service)); const server = Bun.serve({ - port: env.VM_PORT, + port: env.PORT, fetch: app.fetch });