Skip to content

Commit b8c2c7a

Browse files
FinleyGeFinleyGe
authored
fix: docker-compose pg_url removal; depends on pg -> vectorDB (#5733)
1 parent 6955981 commit b8c2c7a

22 files changed

+60
-129
lines changed

‎deploy/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
### 加向量库
1616

1717
比如添加 `exampleDB` 向量库:
18-
1. 添加 vector service 配置在 `templates/vector` 下面，例如 `templates/vector/exampleDB.txt` 内容可以参考其他 txt，注意缩进，image 名字也要替换成 ${{exampleDB.image}}:${{exampleDB:tag}}
18+
1. 添加 vector service 配置在 `templates/vector` 下面，例如 `templates/vector/exampleDB.txt` 内容可以参考其他 txt，注意缩进，image 名字也要替换成 ${{exampleDB.image}}:${{exampleDB:tag}}, service name 必须是 `vectorDB`
1919
2. 在 `args.json` 中添加 `exampleDB` 的配置
2020
3. init.mjs vector enum 中添加 `vector`
2121
4. init.mjs 中添加 vector 的相关配置:
@@ -34,7 +34,7 @@ const vector = {
3434
```
3535

3636
5. init.mjs 读入 vector 配置
37-
37+
3838
```json
3939
{ // 这是个块作用域, 直接搜 read in Vectors
4040
// read in Vectors

‎deploy/docker/cn/docker-compose.milvus.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# 用于部署的 docker-compose 文件:
2-
# - 向量库为 Pgvector
32
# - FastGPT 端口映射为 3000:3000
43
# - FastGPT-mcp-server 端口映射 3005:3000
54
# - 建议修改账密后再运行
@@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token'
109
x-aiproxy-token: &x-aiproxy-token 'token'
1110
# 数据库连接相关配置
1211
x-share-db-config: &x-share-db-config
13-
MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin
12+
MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin
1413
DB_MAX_LINK: 30
1514
REDIS_URL: redis://default:mypassword@redis:6379
1615
S3_ENDPOINT: fastgpt-minio
@@ -47,7 +46,6 @@ services:
4746
# milvus
4847
milvus-etcd:
4948
container_name: milvus-etcd
50-
image:
5149
image: quay.io/coreos/etcd:v3.5.5
5250
environment:
5351
- ETCD_AUTO_COMPACTION_MODE=revision
@@ -64,7 +62,7 @@ services:
6462
interval: 30s
6563
timeout: 20s
6664
retries: 3
67-
milvusStandalone:
65+
vectorDB:
6866
container_name: milvusStandalone
6967
image: milvusdb/milvus:v2.4.3
7068
command: ['milvus', 'run', 'standalone']
@@ -158,7 +156,7 @@ services:
158156
depends_on:
159157
- mongo
160158
- sandbox
161-
- pg
159+
- vectorDB
162160
restart: always
163161
environment:
164162
<<: [*x-share-db-config, *x-vec-config]
@@ -185,9 +183,6 @@ services:
185183
# AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
186184
AIPROXY_API_TOKEN: *x-aiproxy-token
187185

188-
# 数据库最大连接数
189-
PG_URL: postgresql://username:password@pg:5432/postgres
190-
191186
# 日志等级: debug, info, warn, error
192187
LOG_LEVEL: info
193188
STORE_LOG_LEVEL: warn

‎deploy/docker/cn/docker-compose.oceanbase.yml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# 用于部署的 docker-compose 文件:
2-
# - 向量库为 Pgvector
32
# - FastGPT 端口映射为 3000:3000
43
# - FastGPT-mcp-server 端口映射 3005:3000
54
# - 建议修改账密后再运行
@@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token'
109
x-aiproxy-token: &x-aiproxy-token 'token'
1110
# 数据库连接相关配置
1211
x-share-db-config: &x-share-db-config
13-
MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin
12+
MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin
1413
DB_MAX_LINK: 30
1514
REDIS_URL: redis://default:mypassword@redis:6379
1615
S3_ENDPOINT: fastgpt-minio
@@ -21,12 +20,13 @@ x-share-db-config: &x-share-db-config
2120

2221
# 向量库相关配置
2322
x-vec-config: &x-vec-config
24-
undefined
23+
OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/test
24+
2525

2626
version: '3.3'
2727
services:
2828
# Vector DB
29-
ob:
29+
vectorDB:
3030
image: oceanbase/oceanbase-ce:4.3.5-lts
3131
container_name: ob
3232
restart: always
@@ -133,7 +133,7 @@ services:
133133
depends_on:
134134
- mongo
135135
- sandbox
136-
- pg
136+
- vectorDB
137137
restart: always
138138
environment:
139139
<<: [*x-share-db-config, *x-vec-config]
@@ -160,9 +160,6 @@ services:
160160
# AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
161161
AIPROXY_API_TOKEN: *x-aiproxy-token
162162

163-
# 数据库最大连接数
164-
PG_URL: postgresql://username:password@pg:5432/postgres
165-
166163
# 日志等级: debug, info, warn, error
167164
LOG_LEVEL: info
168165
STORE_LOG_LEVEL: warn

‎deploy/docker/cn/docker-compose.pg.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# 用于部署的 docker-compose 文件:
2-
# - 向量库为 Pgvector
32
# - FastGPT 端口映射为 3000:3000
43
# - FastGPT-mcp-server 端口映射 3005:3000
54
# - 建议修改账密后再运行
@@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token'
109
x-aiproxy-token: &x-aiproxy-token 'token'
1110
# 数据库连接相关配置
1211
x-share-db-config: &x-share-db-config
13-
MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin
12+
MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin
1413
DB_MAX_LINK: 30
1514
REDIS_URL: redis://default:mypassword@redis:6379
1615
S3_ENDPOINT: fastgpt-minio
@@ -26,7 +25,7 @@ x-vec-config: &x-vec-config
2625
version: '3.3'
2726
services:
2827
# Vector DB
29-
pg:
28+
vectorDB:
3029
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15
3130
container_name: pg
3231
restart: always
@@ -115,7 +114,7 @@ services:
115114
depends_on:
116115
- mongo
117116
- sandbox
118-
- pg
117+
- vectorDB
119118
restart: always
120119
environment:
121120
<<: [*x-share-db-config, *x-vec-config]
@@ -142,9 +141,6 @@ services:
142141
# AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
143142
AIPROXY_API_TOKEN: *x-aiproxy-token
144143

145-
# 数据库最大连接数
146-
PG_URL: postgresql://username:password@pg:5432/postgres
147-
148144
# 日志等级: debug, info, warn, error
149145
LOG_LEVEL: info
150146
STORE_LOG_LEVEL: warn

‎deploy/docker/cn/docker-compose.zilliz.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# 用于部署的 docker-compose 文件:
2-
# - 向量库为 Pgvector
32
# - FastGPT 端口映射为 3000:3000
43
# - FastGPT-mcp-server 端口映射 3005:3000
54
# - 建议修改账密后再运行
@@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token'
109
x-aiproxy-token: &x-aiproxy-token 'token'
1110
# 数据库连接相关配置
1211
x-share-db-config: &x-share-db-config
13-
MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin
12+
MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin
1413
DB_MAX_LINK: 30
1514
REDIS_URL: redis://default:mypassword@redis:6379
1615
S3_ENDPOINT: fastgpt-minio
@@ -98,7 +97,7 @@ services:
9897
depends_on:
9998
- mongo
10099
- sandbox
101-
- pg
100+
- vectorDB
102101
restart: always
103102
environment:
104103
<<: [*x-share-db-config, *x-vec-config]
@@ -125,9 +124,6 @@ services:
125124
# AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
126125
AIPROXY_API_TOKEN: *x-aiproxy-token
127126

128-
# 数据库最大连接数
129-
PG_URL: postgresql://username:password@pg:5432/postgres
130-
131127
# 日志等级: debug, info, warn, error
132128
LOG_LEVEL: info
133129
STORE_LOG_LEVEL: warn

‎deploy/docker/global/docker-compose.milvus.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# 用于部署的 docker-compose 文件:
2-
# - 向量库为 Pgvector
32
# - FastGPT 端口映射为 3000:3000
43
# - FastGPT-mcp-server 端口映射 3005:3000
54
# - 建议修改账密后再运行
@@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token'
109
x-aiproxy-token: &x-aiproxy-token 'token'
1110
# 数据库连接相关配置
1211
x-share-db-config: &x-share-db-config
13-
MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin
12+
MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin
1413
DB_MAX_LINK: 30
1514
REDIS_URL: redis://default:mypassword@redis:6379
1615
S3_ENDPOINT: fastgpt-minio
@@ -47,7 +46,6 @@ services:
4746
# milvus
4847
milvus-etcd:
4948
container_name: milvus-etcd
50-
image:
5149
image: quay.io/coreos/etcd:v3.5.5
5250
environment:
5351
- ETCD_AUTO_COMPACTION_MODE=revision
@@ -64,7 +62,7 @@ services:
6462
interval: 30s
6563
timeout: 20s
6664
retries: 3
67-
milvusStandalone:
65+
vectorDB:
6866
container_name: milvusStandalone
6967
image: milvusdb/milvus:v2.4.3
7068
command: ['milvus', 'run', 'standalone']
@@ -158,7 +156,7 @@ services:
158156
depends_on:
159157
- mongo
160158
- sandbox
161-
- pg
159+
- vectorDB
162160
restart: always
163161
environment:
164162
<<: [*x-share-db-config, *x-vec-config]
@@ -185,9 +183,6 @@ services:
185183
# AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
186184
AIPROXY_API_TOKEN: *x-aiproxy-token
187185

188-
# 数据库最大连接数
189-
PG_URL: postgresql://username:password@pg:5432/postgres
190-
191186
# 日志等级: debug, info, warn, error
192187
LOG_LEVEL: info
193188
STORE_LOG_LEVEL: warn

‎deploy/docker/global/docker-compose.oceanbase.yml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# 用于部署的 docker-compose 文件:
2-
# - 向量库为 Pgvector
32
# - FastGPT 端口映射为 3000:3000
43
# - FastGPT-mcp-server 端口映射 3005:3000
54
# - 建议修改账密后再运行
@@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token'
109
x-aiproxy-token: &x-aiproxy-token 'token'
1110
# 数据库连接相关配置
1211
x-share-db-config: &x-share-db-config
13-
MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin
12+
MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin
1413
DB_MAX_LINK: 30
1514
REDIS_URL: redis://default:mypassword@redis:6379
1615
S3_ENDPOINT: fastgpt-minio
@@ -21,12 +20,13 @@ x-share-db-config: &x-share-db-config
2120

2221
# 向量库相关配置
2322
x-vec-config: &x-vec-config
24-
undefined
23+
OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/test
24+
2525

2626
version: '3.3'
2727
services:
2828
# Vector DB
29-
ob:
29+
vectorDB:
3030
image: oceanbase/oceanbase-ce:4.3.5-lts
3131
container_name: ob
3232
restart: always
@@ -133,7 +133,7 @@ services:
133133
depends_on:
134134
- mongo
135135
- sandbox
136-
- pg
136+
- vectorDB
137137
restart: always
138138
environment:
139139
<<: [*x-share-db-config, *x-vec-config]
@@ -160,9 +160,6 @@ services:
160160
# AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
161161
AIPROXY_API_TOKEN: *x-aiproxy-token
162162

163-
# 数据库最大连接数
164-
PG_URL: postgresql://username:password@pg:5432/postgres
165-
166163
# 日志等级: debug, info, warn, error
167164
LOG_LEVEL: info
168165
STORE_LOG_LEVEL: warn

‎deploy/docker/global/docker-compose.pg.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# 用于部署的 docker-compose 文件:
2-
# - 向量库为 Pgvector
32
# - FastGPT 端口映射为 3000:3000
43
# - FastGPT-mcp-server 端口映射 3005:3000
54
# - 建议修改账密后再运行
@@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token'
109
x-aiproxy-token: &x-aiproxy-token 'token'
1110
# 数据库连接相关配置
1211
x-share-db-config: &x-share-db-config
13-
MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin
12+
MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin
1413
DB_MAX_LINK: 30
1514
REDIS_URL: redis://default:mypassword@redis:6379
1615
S3_ENDPOINT: fastgpt-minio
@@ -26,7 +25,7 @@ x-vec-config: &x-vec-config
2625
version: '3.3'
2726
services:
2827
# Vector DB
29-
pg:
28+
vectorDB:
3029
image: pgvector/pgvector:0.8.0-pg15
3130
container_name: pg
3231
restart: always
@@ -115,7 +114,7 @@ services:
115114
depends_on:
116115
- mongo
117116
- sandbox
118-
- pg
117+
- vectorDB
119118
restart: always
120119
environment:
121120
<<: [*x-share-db-config, *x-vec-config]
@@ -142,9 +141,6 @@ services:
142141
# AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
143142
AIPROXY_API_TOKEN: *x-aiproxy-token
144143

145-
# 数据库最大连接数
146-
PG_URL: postgresql://username:password@pg:5432/postgres
147-
148144
# 日志等级: debug, info, warn, error
149145
LOG_LEVEL: info
150146
STORE_LOG_LEVEL: warn

‎deploy/docker/global/docker-compose.ziliiz.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# 用于部署的 docker-compose 文件:
2-
# - 向量库为 Pgvector
32
# - FastGPT 端口映射为 3000:3000
43
# - FastGPT-mcp-server 端口映射 3005:3000
54
# - 建议修改账密后再运行
@@ -10,7 +9,7 @@ x-plugin-auth-token: &x-plugin-auth-token 'token'
109
x-aiproxy-token: &x-aiproxy-token 'token'
1110
# 数据库连接相关配置
1211
x-share-db-config: &x-share-db-config
13-
MONGODB_URI: mongodb://username:password@mongo:27017/fastgpt?authSource=admin
12+
MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin
1413
DB_MAX_LINK: 30
1514
REDIS_URL: redis://default:mypassword@redis:6379
1615
S3_ENDPOINT: fastgpt-minio
@@ -98,7 +97,7 @@ services:
9897
depends_on:
9998
- mongo
10099
- sandbox
101-
- pg
100+
- vectorDB
102101
restart: always
103102
environment:
104103
<<: [*x-share-db-config, *x-vec-config]
@@ -125,9 +124,6 @@ services:
125124
# AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY
126125
AIPROXY_API_TOKEN: *x-aiproxy-token
127126

128-
# 数据库最大连接数
129-
PG_URL: postgresql://username:password@pg:5432/postgres
130-
131127
# 日志等级: debug, info, warn, error
132128
LOG_LEVEL: info
133129
STORE_LOG_LEVEL: warn

‎deploy/init.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const vector = {
9595
},
9696
ob: {
9797
db: '',
98-
cofig: `\
98+
config: `\
9999
OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/test
100100
`,
101101
extra: `\

0 commit comments

Comments
 (0)