fix v4.15 compose template yaml syntax and install.sh replacement (#7344)

1d5a4f38 · xyliou · GitHub · df6dc47d · 1d5a4f38 · 1d5a4f38
Commit 1d5a4f38 authored Jul 22, 2026 by xyliou Committed by GitHub Jul 22, 2026
27 changed files
--- a/deploy/version/main/docker-compose.template.yml
+++ b/deploy/version/main/docker-compose.template.yml
@@ -390,4 +390,4 @@ volumes:
  fastgpt-seekdb-config:
  fastgpt-aiproxy_pg:
-${{vec.extraBlock}}
+# ${{vec.extraBlock}}
--- a/deploy/version/v4.15/docker-compose.template.yml
+++ b/deploy/version/v4.15/docker-compose.template.yml
@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config # ${{vec.config}}
+x-vec-config: &x-vec-config
+  # ${{vec.config}}
 services:
  # ${{vec.db}}

--- a/document/public/deploy/docker/main/cn/docker-compose.milvus.yml
+++ b/document/public/deploy/docker/main/cn/docker-compose.milvus.yml
@@ -253,6 +253,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/main/cn/docker-compose.oceanbase.yml
+++ b/document/public/deploy/docker/main/cn/docker-compose.oceanbase.yml
@@ -231,6 +231,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/main/cn/docker-compose.opengauss.yml
+++ b/document/public/deploy/docker/main/cn/docker-compose.opengauss.yml
@@ -215,6 +215,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/main/cn/docker-compose.pg.yml
+++ b/document/public/deploy/docker/main/cn/docker-compose.pg.yml
@@ -213,6 +213,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/main/cn/docker-compose.seekdb.yml
+++ b/document/public/deploy/docker/main/cn/docker-compose.seekdb.yml
@@ -218,6 +218,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/main/cn/docker-compose.zilliz.yml
+++ b/document/public/deploy/docker/main/cn/docker-compose.zilliz.yml
@@ -194,6 +194,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/main/global/docker-compose.milvus.yml
+++ b/document/public/deploy/docker/main/global/docker-compose.milvus.yml
@@ -253,6 +253,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/main/global/docker-compose.oceanbase.yml
+++ b/document/public/deploy/docker/main/global/docker-compose.oceanbase.yml
@@ -231,6 +231,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/main/global/docker-compose.opengauss.yml
+++ b/document/public/deploy/docker/main/global/docker-compose.opengauss.yml
@@ -215,6 +215,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/main/global/docker-compose.pg.yml
+++ b/document/public/deploy/docker/main/global/docker-compose.pg.yml
@@ -213,6 +213,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/main/global/docker-compose.seekdb.yml
+++ b/document/public/deploy/docker/main/global/docker-compose.seekdb.yml
@@ -218,6 +218,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/main/global/docker-compose.zilliz.yml
+++ b/document/public/deploy/docker/main/global/docker-compose.zilliz.yml
@@ -194,6 +194,9 @@ services:
      AIPROXY_API_TOKEN: *x-aiproxy-token
      # MCP Server 代理地址，用于 MCP 使用方式页拼接 SSE 地址
      SSE_MCP_SERVER_PROXY_ENDPOINT:
+      # 官网访客归因 CRM；地址需包含 /api/v1，为空时不进行身份上报
+      CRM_API_URL:
+      CRM_API_KEY:
      # ==================== 日志与监控 ====================
      # 传递给 OTLP 收集器的服务名称

--- a/document/public/deploy/docker/v4.15/cn/docker-compose.milvus.yml
+++ b/document/public/deploy/docker/v4.15/cn/docker-compose.milvus.yml
@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   MILVUS_ADDRESS: http://fastgpt-vector:19530
+x-vec-config: &x-vec-config
+  MILVUS_ADDRESS: http://fastgpt-vector:19530
  MILVUS_TOKEN: none
 services:
  fastgpt-milvus-minio:
    container_name: fastgpt-milvus-minio

--- a/document/public/deploy/docker/v4.15/cn/docker-compose.oceanbase.yml
+++ b/document/public/deploy/docker/v4.15/cn/docker-compose.oceanbase.yml
@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-vector:2881/mysql
+x-vec-config: &x-vec-config
+  OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-vector:2881/mysql
 services:
  fastgpt-vector:

--- a/document/public/deploy/docker/v4.15/cn/docker-compose.opengauss.yml
+++ b/document/public/deploy/docker/v4.15/cn/docker-compose.opengauss.yml
@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   OPENGAUSS_URL: postgresql://gaussdb:FastGPT@123@fastgpt-vector:5432/fastgpt
+x-vec-config: &x-vec-config
+  OPENGAUSS_URL: postgresql://gaussdb:FastGPT@123@fastgpt-vector:5432/fastgpt
 services:
  fastgpt-vector:

--- a/document/public/deploy/docker/v4.15/cn/docker-compose.pg.yml
+++ b/document/public/deploy/docker/v4.15/cn/docker-compose.pg.yml
@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   PG_URL: postgresql://username:password@fastgpt-vector:5432/postgres
+x-vec-config: &x-vec-config
+  PG_URL: postgresql://username:password@fastgpt-vector:5432/postgres
 services:
  fastgpt-vector:

--- a/document/public/deploy/docker/v4.15/cn/docker-compose.seekdb.yml
+++ b/document/public/deploy/docker/v4.15/cn/docker-compose.seekdb.yml
@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-vector:2881/mysql
+x-vec-config: &x-vec-config
+  SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-vector:2881/mysql
 services:
  fastgpt-vector:

--- a/document/public/deploy/docker/v4.15/cn/docker-compose.zilliz.yml
+++ b/document/public/deploy/docker/v4.15/cn/docker-compose.zilliz.yml
@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   MILVUS_ADDRESS: zilliz_cloud_address
+x-vec-config: &x-vec-config
+  MILVUS_ADDRESS: zilliz_cloud_address
  MILVUS_TOKEN: zilliz_cloud_token
 services:
  fastgpt-mongo:
    image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29

--- a/document/public/deploy/docker/v4.15/global/docker-compose.milvus.yml
+++ b/document/public/deploy/docker/v4.15/global/docker-compose.milvus.yml
@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   MILVUS_ADDRESS: http://fastgpt-vector:19530
+x-vec-config: &x-vec-config
+  MILVUS_ADDRESS: http://fastgpt-vector:19530
  MILVUS_TOKEN: none
 services:
  fastgpt-milvus-minio:
    container_name: fastgpt-milvus-minio

--- a/document/public/deploy/docker/v4.15/global/docker-compose.oceanbase.yml
+++ b/document/public/deploy/docker/v4.15/global/docker-compose.oceanbase.yml
@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-vector:2881/mysql
+x-vec-config: &x-vec-config
+  OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-vector:2881/mysql
 services:
  fastgpt-vector:

--- a/document/public/deploy/docker/v4.15/global/docker-compose.opengauss.yml
+++ b/document/public/deploy/docker/v4.15/global/docker-compose.opengauss.yml
@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   OPENGAUSS_URL: postgresql://gaussdb:FastGPT@123@fastgpt-vector:5432/fastgpt
+x-vec-config: &x-vec-config
+  OPENGAUSS_URL: postgresql://gaussdb:FastGPT@123@fastgpt-vector:5432/fastgpt
 services:
  fastgpt-vector:

--- a/document/public/deploy/docker/v4.15/global/docker-compose.pg.yml
+++ b/document/public/deploy/docker/v4.15/global/docker-compose.pg.yml
@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   PG_URL: postgresql://username:password@fastgpt-vector:5432/postgres
+x-vec-config: &x-vec-config
+  PG_URL: postgresql://username:password@fastgpt-vector:5432/postgres
 services:
  fastgpt-vector:

--- a/document/public/deploy/docker/v4.15/global/docker-compose.seekdb.yml
+++ b/document/public/deploy/docker/v4.15/global/docker-compose.seekdb.yml
@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-vector:2881/mysql
+x-vec-config: &x-vec-config
+  SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-vector:2881/mysql
 services:
  fastgpt-vector:

--- a/document/public/deploy/docker/v4.15/global/docker-compose.zilliz.yml
+++ b/document/public/deploy/docker/v4.15/global/docker-compose.zilliz.yml
@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config
  WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
 # 向量库相关配置
-x-vec-config: &x-vec-config #   MILVUS_ADDRESS: zilliz_cloud_address
+x-vec-config: &x-vec-config
+  MILVUS_ADDRESS: zilliz_cloud_address
  MILVUS_TOKEN: zilliz_cloud_token
 services:
  fastgpt-mongo:
    image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29

--- a/document/public/deploy/install.sh
+++ b/document/public/deploy/install.sh
@@ -286,7 +286,7 @@ randomize_compose_credentials() {
    replace_text "mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt-plugin?authSource=admin" "mongodb://myusername:$mongo_password@fastgpt-mongo:27017/fastgpt-plugin?authSource=admin"
    replace_text "- MONGO_INITDB_ROOT_PASSWORD=mypassword" "- MONGO_INITDB_ROOT_PASSWORD=$mongo_password"
    replace_text "'-p', 'mypassword'" "'-p', '$mongo_password'"
-    replace_text '"mypassword",' "\"$mongo_password\","
+    replace_text "'mypassword'," "'$mongo_password',"
    replace_text " mongo -u myusername -p mypassword " " mongo -u myusername -p $mongo_password "
    # Redis 密码需要同时改连接串、启动命令和健康检查。