fix: docker-compose pg_url removal; depends on pg -> vectorDB (#5733)

This commit is contained in:
Finley Ge
2025-10-06 11:42:57 +08:00
committed by GitHub
parent 69559814e7
commit b8c2c7ad98
22 changed files with 60 additions and 129 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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