From b8c2c7ad987c0d68d137fdb879f68aedea8dbfc0 Mon Sep 17 00:00:00 2001 From: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Date: Mon, 6 Oct 2025 11:42:57 +0800 Subject: [PATCH] fix: docker-compose pg_url removal; depends on pg -> vectorDB (#5733) --- deploy/README.md | 4 ++-- deploy/docker/cn/docker-compose.milvus.yml | 11 +++-------- deploy/docker/cn/docker-compose.oceanbase.yml | 13 +++++-------- deploy/docker/cn/docker-compose.pg.yml | 10 +++------- deploy/docker/cn/docker-compose.zilliz.yml | 8 ++------ deploy/docker/global/docker-compose.milvus.yml | 11 +++-------- deploy/docker/global/docker-compose.oceanbase.yml | 13 +++++-------- deploy/docker/global/docker-compose.pg.yml | 10 +++------- deploy/docker/global/docker-compose.ziliiz.yml | 8 ++------ deploy/init.mjs | 2 +- deploy/templates/docker-compose.prod.yml | 8 ++------ deploy/templates/vector/milvus.txt | 3 +-- deploy/templates/vector/ob.txt | 2 +- deploy/templates/vector/pg.txt | 2 +- .../deploy/docker/cn/docker-compose.milvus.yml | 11 +++-------- .../deploy/docker/cn/docker-compose.oceanbase.yml | 13 +++++-------- .../public/deploy/docker/cn/docker-compose.pg.yml | 10 +++------- .../deploy/docker/cn/docker-compose.zilliz.yml | 8 ++------ .../deploy/docker/global/docker-compose.milvus.yml | 11 +++-------- .../docker/global/docker-compose.oceanbase.yml | 13 +++++-------- .../deploy/docker/global/docker-compose.pg.yml | 10 +++------- .../deploy/docker/global/docker-compose.ziliiz.yml | 8 ++------ 22 files changed, 60 insertions(+), 129 deletions(-) diff --git a/deploy/README.md b/deploy/README.md index da949e8d5..2fe1e0d9a 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -15,7 +15,7 @@ ### 加向量库 比如添加 `exampleDB` 向量库: -1. 添加 vector service 配置在 `templates/vector` 下面,例如 `templates/vector/exampleDB.txt` 内容可以参考其他 txt,注意缩进,image 名字也要替换成 ${{exampleDB.image}}:${{exampleDB:tag}} +1. 添加 vector service 配置在 `templates/vector` 下面,例如 `templates/vector/exampleDB.txt` 内容可以参考其他 txt,注意缩进,image 名字也要替换成 ${{exampleDB.image}}:${{exampleDB:tag}}, service name 必须是 `vectorDB` 2. 在 `args.json` 中添加 `exampleDB` 的配置 3. init.mjs vector enum 中添加 `vector` 4. init.mjs 中添加 vector 的相关配置: @@ -34,7 +34,7 @@ const vector = { ``` 5. init.mjs 读入 vector 配置 - + ```json { // 这是个块作用域, 直接搜 read in Vectors // read in Vectors diff --git a/deploy/docker/cn/docker-compose.milvus.yml b/deploy/docker/cn/docker-compose.milvus.yml index 6c21f21a7..058c5ab3f 100644 --- a/deploy/docker/cn/docker-compose.milvus.yml +++ b/deploy/docker/cn/docker-compose.milvus.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -47,7 +46,6 @@ services: # milvus milvus-etcd: container_name: milvus-etcd - image: image: quay.io/coreos/etcd:v3.5.5 environment: - ETCD_AUTO_COMPACTION_MODE=revision @@ -64,7 +62,7 @@ services: interval: 30s timeout: 20s retries: 3 - milvusStandalone: + vectorDB: container_name: milvusStandalone image: milvusdb/milvus:v2.4.3 command: ['milvus', 'run', 'standalone'] @@ -158,7 +156,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -185,9 +183,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/deploy/docker/cn/docker-compose.oceanbase.yml b/deploy/docker/cn/docker-compose.oceanbase.yml index 5adc5a4d1..1d287c19d 100644 --- a/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/deploy/docker/cn/docker-compose.oceanbase.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -21,12 +20,13 @@ x-share-db-config: &x-share-db-config # 向量库相关配置 x-vec-config: &x-vec-config -undefined + OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/test + version: '3.3' services: # Vector DB - ob: + vectorDB: image: oceanbase/oceanbase-ce:4.3.5-lts container_name: ob restart: always @@ -133,7 +133,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -160,9 +160,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/deploy/docker/cn/docker-compose.pg.yml b/deploy/docker/cn/docker-compose.pg.yml index 146d2d877..ccce9b252 100644 --- a/deploy/docker/cn/docker-compose.pg.yml +++ b/deploy/docker/cn/docker-compose.pg.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -26,7 +25,7 @@ x-vec-config: &x-vec-config version: '3.3' services: # Vector DB - pg: + vectorDB: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 container_name: pg restart: always @@ -115,7 +114,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -142,9 +141,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/deploy/docker/cn/docker-compose.zilliz.yml b/deploy/docker/cn/docker-compose.zilliz.yml index 5287ec778..20fa6f382 100644 --- a/deploy/docker/cn/docker-compose.zilliz.yml +++ b/deploy/docker/cn/docker-compose.zilliz.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -98,7 +97,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -125,9 +124,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/deploy/docker/global/docker-compose.milvus.yml b/deploy/docker/global/docker-compose.milvus.yml index 483ddb211..6dc6527fd 100644 --- a/deploy/docker/global/docker-compose.milvus.yml +++ b/deploy/docker/global/docker-compose.milvus.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -47,7 +46,6 @@ services: # milvus milvus-etcd: container_name: milvus-etcd - image: image: quay.io/coreos/etcd:v3.5.5 environment: - ETCD_AUTO_COMPACTION_MODE=revision @@ -64,7 +62,7 @@ services: interval: 30s timeout: 20s retries: 3 - milvusStandalone: + vectorDB: container_name: milvusStandalone image: milvusdb/milvus:v2.4.3 command: ['milvus', 'run', 'standalone'] @@ -158,7 +156,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -185,9 +183,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/deploy/docker/global/docker-compose.oceanbase.yml b/deploy/docker/global/docker-compose.oceanbase.yml index 5e825506d..e38eb9672 100644 --- a/deploy/docker/global/docker-compose.oceanbase.yml +++ b/deploy/docker/global/docker-compose.oceanbase.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -21,12 +20,13 @@ x-share-db-config: &x-share-db-config # 向量库相关配置 x-vec-config: &x-vec-config -undefined + OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/test + version: '3.3' services: # Vector DB - ob: + vectorDB: image: oceanbase/oceanbase-ce:4.3.5-lts container_name: ob restart: always @@ -133,7 +133,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -160,9 +160,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/deploy/docker/global/docker-compose.pg.yml b/deploy/docker/global/docker-compose.pg.yml index 32780eac8..facce6202 100644 --- a/deploy/docker/global/docker-compose.pg.yml +++ b/deploy/docker/global/docker-compose.pg.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -26,7 +25,7 @@ x-vec-config: &x-vec-config version: '3.3' services: # Vector DB - pg: + vectorDB: image: pgvector/pgvector:0.8.0-pg15 container_name: pg restart: always @@ -115,7 +114,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -142,9 +141,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/deploy/docker/global/docker-compose.ziliiz.yml b/deploy/docker/global/docker-compose.ziliiz.yml index 0f4fe4660..b68566d85 100644 --- a/deploy/docker/global/docker-compose.ziliiz.yml +++ b/deploy/docker/global/docker-compose.ziliiz.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -98,7 +97,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -125,9 +124,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/deploy/init.mjs b/deploy/init.mjs index d8d32ae3e..cc95986b9 100644 --- a/deploy/init.mjs +++ b/deploy/init.mjs @@ -95,7 +95,7 @@ const vector = { }, ob: { db: '', - cofig: `\ + config: `\ OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/test `, extra: `\ diff --git a/deploy/templates/docker-compose.prod.yml b/deploy/templates/docker-compose.prod.yml index 16987dcdd..fe3fc8252 100644 --- a/deploy/templates/docker-compose.prod.yml +++ b/deploy/templates/docker-compose.prod.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -97,7 +96,7 @@ ${{vec.db}} depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -124,9 +123,6 @@ ${{vec.db}} # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/deploy/templates/vector/milvus.txt b/deploy/templates/vector/milvus.txt index 377773941..ebc5f125d 100644 --- a/deploy/templates/vector/milvus.txt +++ b/deploy/templates/vector/milvus.txt @@ -17,7 +17,6 @@ # milvus milvus-etcd: container_name: milvus-etcd - image: image: ${{milvus-etcd.image}}:${{milvus-etcd.tag}} environment: - ETCD_AUTO_COMPACTION_MODE=revision @@ -34,7 +33,7 @@ interval: 30s timeout: 20s retries: 3 - milvusStandalone: + vectorDB: container_name: milvusStandalone image: ${{milvus-standalone.image}}:${{milvus-standalone.tag}} command: ['milvus', 'run', 'standalone'] diff --git a/deploy/templates/vector/ob.txt b/deploy/templates/vector/ob.txt index 7b03a13e9..c2995df05 100644 --- a/deploy/templates/vector/ob.txt +++ b/deploy/templates/vector/ob.txt @@ -1,4 +1,4 @@ - ob: + vectorDB: image: ${{oceanbase.image}}:${{oceanbase.tag}} container_name: ob restart: always diff --git a/deploy/templates/vector/pg.txt b/deploy/templates/vector/pg.txt index f712f2b0e..0042123d3 100644 --- a/deploy/templates/vector/pg.txt +++ b/deploy/templates/vector/pg.txt @@ -1,4 +1,4 @@ - pg: + vectorDB: image: ${{pg.image}}:${{pg.tag}} container_name: pg restart: always diff --git a/document/public/deploy/docker/cn/docker-compose.milvus.yml b/document/public/deploy/docker/cn/docker-compose.milvus.yml index 6c21f21a7..058c5ab3f 100644 --- a/document/public/deploy/docker/cn/docker-compose.milvus.yml +++ b/document/public/deploy/docker/cn/docker-compose.milvus.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -47,7 +46,6 @@ services: # milvus milvus-etcd: container_name: milvus-etcd - image: image: quay.io/coreos/etcd:v3.5.5 environment: - ETCD_AUTO_COMPACTION_MODE=revision @@ -64,7 +62,7 @@ services: interval: 30s timeout: 20s retries: 3 - milvusStandalone: + vectorDB: container_name: milvusStandalone image: milvusdb/milvus:v2.4.3 command: ['milvus', 'run', 'standalone'] @@ -158,7 +156,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -185,9 +183,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml index 5adc5a4d1..1d287c19d 100644 --- a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -21,12 +20,13 @@ x-share-db-config: &x-share-db-config # 向量库相关配置 x-vec-config: &x-vec-config -undefined + OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/test + version: '3.3' services: # Vector DB - ob: + vectorDB: image: oceanbase/oceanbase-ce:4.3.5-lts container_name: ob restart: always @@ -133,7 +133,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -160,9 +160,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/document/public/deploy/docker/cn/docker-compose.pg.yml b/document/public/deploy/docker/cn/docker-compose.pg.yml index 146d2d877..ccce9b252 100644 --- a/document/public/deploy/docker/cn/docker-compose.pg.yml +++ b/document/public/deploy/docker/cn/docker-compose.pg.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -26,7 +25,7 @@ x-vec-config: &x-vec-config version: '3.3' services: # Vector DB - pg: + vectorDB: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 container_name: pg restart: always @@ -115,7 +114,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -142,9 +141,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/document/public/deploy/docker/cn/docker-compose.zilliz.yml b/document/public/deploy/docker/cn/docker-compose.zilliz.yml index 5287ec778..20fa6f382 100644 --- a/document/public/deploy/docker/cn/docker-compose.zilliz.yml +++ b/document/public/deploy/docker/cn/docker-compose.zilliz.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -98,7 +97,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -125,9 +124,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/document/public/deploy/docker/global/docker-compose.milvus.yml b/document/public/deploy/docker/global/docker-compose.milvus.yml index 483ddb211..6dc6527fd 100644 --- a/document/public/deploy/docker/global/docker-compose.milvus.yml +++ b/document/public/deploy/docker/global/docker-compose.milvus.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -47,7 +46,6 @@ services: # milvus milvus-etcd: container_name: milvus-etcd - image: image: quay.io/coreos/etcd:v3.5.5 environment: - ETCD_AUTO_COMPACTION_MODE=revision @@ -64,7 +62,7 @@ services: interval: 30s timeout: 20s retries: 3 - milvusStandalone: + vectorDB: container_name: milvusStandalone image: milvusdb/milvus:v2.4.3 command: ['milvus', 'run', 'standalone'] @@ -158,7 +156,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -185,9 +183,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/document/public/deploy/docker/global/docker-compose.oceanbase.yml b/document/public/deploy/docker/global/docker-compose.oceanbase.yml index 5e825506d..e38eb9672 100644 --- a/document/public/deploy/docker/global/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/global/docker-compose.oceanbase.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -21,12 +20,13 @@ x-share-db-config: &x-share-db-config # 向量库相关配置 x-vec-config: &x-vec-config -undefined + OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/test + version: '3.3' services: # Vector DB - ob: + vectorDB: image: oceanbase/oceanbase-ce:4.3.5-lts container_name: ob restart: always @@ -133,7 +133,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -160,9 +160,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/document/public/deploy/docker/global/docker-compose.pg.yml b/document/public/deploy/docker/global/docker-compose.pg.yml index 32780eac8..facce6202 100644 --- a/document/public/deploy/docker/global/docker-compose.pg.yml +++ b/document/public/deploy/docker/global/docker-compose.pg.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -26,7 +25,7 @@ x-vec-config: &x-vec-config version: '3.3' services: # Vector DB - pg: + vectorDB: image: pgvector/pgvector:0.8.0-pg15 container_name: pg restart: always @@ -115,7 +114,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -142,9 +141,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn diff --git a/document/public/deploy/docker/global/docker-compose.ziliiz.yml b/document/public/deploy/docker/global/docker-compose.ziliiz.yml index 0f4fe4660..b68566d85 100644 --- a/document/public/deploy/docker/global/docker-compose.ziliiz.yml +++ b/document/public/deploy/docker/global/docker-compose.ziliiz.yml @@ -1,5 +1,4 @@ # 用于部署的 docker-compose 文件: -# - 向量库为 Pgvector # - FastGPT 端口映射为 3000:3000 # - FastGPT-mcp-server 端口映射 3005:3000 # - 建议修改账密后再运行 @@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 S3_ENDPOINT: fastgpt-minio @@ -98,7 +97,7 @@ services: depends_on: - mongo - sandbox - - pg + - vectorDB restart: always environment: <<: [*x-share-db-config, *x-vec-config] @@ -125,9 +124,6 @@ services: # AI Proxy 的 Admin Token,与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token - # 数据库最大连接数 - PG_URL: postgresql://username:password@pg:5432/postgres - # 日志等级: debug, info, warn, error LOG_LEVEL: info STORE_LOG_LEVEL: warn