Skip to content

Commit c99ad97

Browse files
c121914yuc121914yu
committed
doc
1 parent 927d5f0 commit c99ad97

21 files changed

+282
-93
lines changed

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ x-share-db-config: &x-share-db-config
1919
STORAGE_SECRET_ACCESS_KEY: minioadmin
2020
STORAGE_PUBLIC_BUCKET: fastgpt-public
2121
STORAGE_PRIVATE_BUCKET: fastgpt-private
22-
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个公开的、完整的携带协议和端口的、前端和用户可以直接访问的、固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址
22+
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个服务器和客户端均可访问到存储桶的地址，可以是固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址(因为容器里无法使用)
2323
STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口
2424
STORAGE_S3_FORCE_PATH_STYLE: true
2525
STORAGE_S3_MAX_RETRIES: 3
@@ -28,7 +28,6 @@ x-share-db-config: &x-share-db-config
2828
x-vec-config: &x-vec-config
2929
MILVUS_ADDRESS: http://milvusStandalone:19530
3030
MILVUS_TOKEN: none
31-
3231

3332
version: '3.3'
3433
services:
@@ -92,7 +91,6 @@ services:
9291
- 'milvus-etcd'
9392
- 'milvus-minio'
9493

95-
9694
mongo:
9795
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29
9896
container_name: mongo
@@ -106,7 +104,19 @@ services:
106104
volumes:
107105
- ./mongo/data:/data/db
108106
healthcheck:
109-
test: ['CMD', 'mongo', '-u', 'myusername', '-p', 'mypassword', '--authenticationDatabase', 'admin', '--eval', "db.adminCommand('ping')"]
107+
test:
108+
[
109+
'CMD',
110+
'mongo',
111+
'-u',
112+
'myusername',
113+
'-p',
114+
'mypassword',
115+
'--authenticationDatabase',
116+
'admin',
117+
'--eval',
118+
"db.adminCommand('ping')"
119+
]
110120
interval: 10s
111121
timeout: 5s
112122
retries: 5
@@ -313,4 +323,3 @@ networks:
313323
fastgpt:
314324
aiproxy:
315325
vector:
316-

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ x-share-db-config: &x-share-db-config
1919
STORAGE_SECRET_ACCESS_KEY: minioadmin
2020
STORAGE_PUBLIC_BUCKET: fastgpt-public
2121
STORAGE_PRIVATE_BUCKET: fastgpt-private
22-
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个公开的、完整的携带协议和端口的、前端和用户可以直接访问的、固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址
22+
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个服务器和客户端均可访问到存储桶的地址，可以是固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址(因为容器里无法使用)
2323
STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口
2424
STORAGE_S3_FORCE_PATH_STYLE: true
2525
STORAGE_S3_MAX_RETRIES: 3
@@ -28,12 +28,11 @@ x-share-db-config: &x-share-db-config
2828
x-vec-config: &x-vec-config
2929
OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/test
3030

31-
3231
version: '3.3'
3332
services:
3433
# Vector DB
3534
vectorDB:
36-
image: oceanbase/oceanbase-ce:4.3.5-lts
35+
image: oceanbase/oceanbase-ce:4.3.5-lts
3736
container_name: ob
3837
restart: always
3938
# ports: # 生产环境建议不要暴露
@@ -61,15 +60,14 @@ services:
6160
# obclient -h127.0.0.1 -P2881 -uroot@tenantname -ptenantpassword -e "SELECT 1;"
6261
test:
6362
[
64-
"CMD-SHELL",
65-
'obclient -h$${OB_SERVER_IP} -P2881 -uroot@$${OB_TENANT_NAME} -p$${OB_TENANT_PASSWORD} -e "SELECT 1;"',
63+
'CMD-SHELL',
64+
'obclient -h$${OB_SERVER_IP} -P2881 -uroot@$${OB_TENANT_NAME} -p$${OB_TENANT_PASSWORD} -e "SELECT 1;"'
6665
]
6766
interval: 30s
6867
timeout: 10s
6968
retries: 1000
7069
start_period: 10s
7170

72-
7371
mongo:
7472
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29
7573
container_name: mongo
@@ -83,7 +81,19 @@ services:
8381
volumes:
8482
- ./mongo/data:/data/db
8583
healthcheck:
86-
test: ['CMD', 'mongo', '-u', 'myusername', '-p', 'mypassword', '--authenticationDatabase', 'admin', '--eval', "db.adminCommand('ping')"]
84+
test:
85+
[
86+
'CMD',
87+
'mongo',
88+
'-u',
89+
'myusername',
90+
'-p',
91+
'mypassword',
92+
'--authenticationDatabase',
93+
'admin',
94+
'--eval',
95+
"db.adminCommand('ping')"
96+
]
8797
interval: 10s
8898
timeout: 5s
8999
retries: 5
@@ -295,4 +305,3 @@ configs:
295305
name: init_sql
296306
content: |
297307
ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30;
298-

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ x-share-db-config: &x-share-db-config
1919
STORAGE_SECRET_ACCESS_KEY: minioadmin
2020
STORAGE_PUBLIC_BUCKET: fastgpt-public
2121
STORAGE_PRIVATE_BUCKET: fastgpt-private
22-
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个公开的、完整的携带协议和端口的、前端和用户可以直接访问的、固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址
22+
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个服务器和客户端均可访问到存储桶的地址，可以是固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址(因为容器里无法使用)
2323
STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口
2424
STORAGE_S3_FORCE_PATH_STYLE: true
2525
STORAGE_S3_MAX_RETRIES: 3
@@ -50,7 +50,6 @@ services:
5050
timeout: 5s
5151
retries: 10
5252

53-
5453
mongo:
5554
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29
5655
container_name: mongo
@@ -64,7 +63,19 @@ services:
6463
volumes:
6564
- ./mongo/data:/data/db
6665
healthcheck:
67-
test: ['CMD', 'mongo', '-u', 'myusername', '-p', 'mypassword', '--authenticationDatabase', 'admin', '--eval', "db.adminCommand('ping')"]
66+
test:
67+
[
68+
'CMD',
69+
'mongo',
70+
'-u',
71+
'myusername',
72+
'-p',
73+
'mypassword',
74+
'--authenticationDatabase',
75+
'admin',
76+
'--eval',
77+
"db.adminCommand('ping')"
78+
]
6879
interval: 10s
6980
timeout: 5s
7081
retries: 5
@@ -271,4 +282,3 @@ networks:
271282
fastgpt:
272283
aiproxy:
273284
vector:
274-

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ x-share-db-config: &x-share-db-config
1919
STORAGE_SECRET_ACCESS_KEY: minioadmin
2020
STORAGE_PUBLIC_BUCKET: fastgpt-public
2121
STORAGE_PRIVATE_BUCKET: fastgpt-private
22-
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个公开的、完整的携带协议和端口的、前端和用户可以直接访问的、固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址
22+
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个服务器和客户端均可访问到存储桶的地址，可以是固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址(因为容器里无法使用)
2323
STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口
2424
STORAGE_S3_FORCE_PATH_STYLE: true
2525
STORAGE_S3_MAX_RETRIES: 3
@@ -33,7 +33,6 @@ version: '3.3'
3333
services:
3434
# Vector DB
3535

36-
3736
mongo:
3837
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29
3938
container_name: mongo
@@ -47,7 +46,19 @@ services:
4746
volumes:
4847
- ./mongo/data:/data/db
4948
healthcheck:
50-
test: ['CMD', 'mongo', '-u', 'myusername', '-p', 'mypassword', '--authenticationDatabase', 'admin', '--eval', "db.adminCommand('ping')"]
49+
test:
50+
[
51+
'CMD',
52+
'mongo',
53+
'-u',
54+
'myusername',
55+
'-p',
56+
'mypassword',
57+
'--authenticationDatabase',
58+
'admin',
59+
'--eval',
60+
"db.adminCommand('ping')"
61+
]
5162
interval: 10s
5263
timeout: 5s
5364
retries: 5
@@ -254,4 +265,3 @@ networks:
254265
fastgpt:
255266
aiproxy:
256267
vector:
257-

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ x-share-db-config: &x-share-db-config
1919
STORAGE_SECRET_ACCESS_KEY: minioadmin
2020
STORAGE_PUBLIC_BUCKET: fastgpt-public
2121
STORAGE_PRIVATE_BUCKET: fastgpt-private
22-
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个公开的、完整的携带协议和端口的、前端和用户可以直接访问的、固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址
22+
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个服务器和客户端均可访问到存储桶的地址，可以是固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址(因为容器里无法使用)
2323
STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口
2424
STORAGE_S3_FORCE_PATH_STYLE: true
2525
STORAGE_S3_MAX_RETRIES: 3
@@ -28,7 +28,6 @@ x-share-db-config: &x-share-db-config
2828
x-vec-config: &x-vec-config
2929
MILVUS_ADDRESS: http://milvusStandalone:19530
3030
MILVUS_TOKEN: none
31-
3231

3332
version: '3.3'
3433
services:
@@ -92,7 +91,6 @@ services:
9291
- 'milvus-etcd'
9392
- 'milvus-minio'
9493

95-
9694
mongo:
9795
image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29
9896
container_name: mongo
@@ -106,7 +104,19 @@ services:
106104
volumes:
107105
- ./mongo/data:/data/db
108106
healthcheck:
109-
test: ['CMD', 'mongo', '-u', 'myusername', '-p', 'mypassword', '--authenticationDatabase', 'admin', '--eval', "db.adminCommand('ping')"]
107+
test:
108+
[
109+
'CMD',
110+
'mongo',
111+
'-u',
112+
'myusername',
113+
'-p',
114+
'mypassword',
115+
'--authenticationDatabase',
116+
'admin',
117+
'--eval',
118+
"db.adminCommand('ping')"
119+
]
110120
interval: 10s
111121
timeout: 5s
112122
retries: 5
@@ -313,4 +323,3 @@ networks:
313323
fastgpt:
314324
aiproxy:
315325
vector:
316-

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ x-share-db-config: &x-share-db-config
1919
STORAGE_SECRET_ACCESS_KEY: minioadmin
2020
STORAGE_PUBLIC_BUCKET: fastgpt-public
2121
STORAGE_PRIVATE_BUCKET: fastgpt-private
22-
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个公开的、完整的携带协议和端口的、前端和用户可以直接访问的、固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址
22+
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个服务器和客户端均可访问到存储桶的地址，可以是固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址(因为容器里无法使用)
2323
STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口
2424
STORAGE_S3_FORCE_PATH_STYLE: true
2525
STORAGE_S3_MAX_RETRIES: 3
@@ -28,12 +28,11 @@ x-share-db-config: &x-share-db-config
2828
x-vec-config: &x-vec-config
2929
OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/test
3030

31-
3231
version: '3.3'
3332
services:
3433
# Vector DB
3534
vectorDB:
36-
image: oceanbase/oceanbase-ce:4.3.5-lts
35+
image: oceanbase/oceanbase-ce:4.3.5-lts
3736
container_name: ob
3837
restart: always
3938
# ports: # 生产环境建议不要暴露
@@ -61,15 +60,14 @@ services:
6160
# obclient -h127.0.0.1 -P2881 -uroot@tenantname -ptenantpassword -e "SELECT 1;"
6261
test:
6362
[
64-
"CMD-SHELL",
65-
'obclient -h$${OB_SERVER_IP} -P2881 -uroot@$${OB_TENANT_NAME} -p$${OB_TENANT_PASSWORD} -e "SELECT 1;"',
63+
'CMD-SHELL',
64+
'obclient -h$${OB_SERVER_IP} -P2881 -uroot@$${OB_TENANT_NAME} -p$${OB_TENANT_PASSWORD} -e "SELECT 1;"'
6665
]
6766
interval: 30s
6867
timeout: 10s
6968
retries: 1000
7069
start_period: 10s
7170

72-
7371
mongo:
7472
image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29
7573
container_name: mongo
@@ -83,7 +81,19 @@ services:
8381
volumes:
8482
- ./mongo/data:/data/db
8583
healthcheck:
86-
test: ['CMD', 'mongo', '-u', 'myusername', '-p', 'mypassword', '--authenticationDatabase', 'admin', '--eval', "db.adminCommand('ping')"]
84+
test:
85+
[
86+
'CMD',
87+
'mongo',
88+
'-u',
89+
'myusername',
90+
'-p',
91+
'mypassword',
92+
'--authenticationDatabase',
93+
'admin',
94+
'--eval',
95+
"db.adminCommand('ping')"
96+
]
8797
interval: 10s
8898
timeout: 5s
8999
retries: 5
@@ -295,4 +305,3 @@ configs:
295305
name: init_sql
296306
content: |
297307
ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30;
298-

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ x-share-db-config: &x-share-db-config
1919
STORAGE_SECRET_ACCESS_KEY: minioadmin
2020
STORAGE_PUBLIC_BUCKET: fastgpt-public
2121
STORAGE_PRIVATE_BUCKET: fastgpt-private
22-
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个公开的、完整的携带协议和端口的、前端和用户可以直接访问的、固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址
22+
STORAGE_EXTERNAL_ENDPOINT: http://192.168.0.2:9000 # 一个服务器和客户端均可访问到存储桶的地址，可以是固定的宿主机 IP 或者域名，注意不要填写成 127.0.0.1 或者 localhost 等本地回环地址(因为容器里无法使用)
2323
STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口
2424
STORAGE_S3_FORCE_PATH_STYLE: true
2525
STORAGE_S3_MAX_RETRIES: 3
@@ -50,7 +50,6 @@ services:
5050
timeout: 5s
5151
retries: 10
5252

53-
5453
mongo:
5554
image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29
5655
container_name: mongo
@@ -64,7 +63,19 @@ services:
6463
volumes:
6564
- ./mongo/data:/data/db
6665
healthcheck:
67-
test: ['CMD', 'mongo', '-u', 'myusername', '-p', 'mypassword', '--authenticationDatabase', 'admin', '--eval', "db.adminCommand('ping')"]
66+
test:
67+
[
68+
'CMD',
69+
'mongo',
70+
'-u',
71+
'myusername',
72+
'-p',
73+
'mypassword',
74+
'--authenticationDatabase',
75+
'admin',
76+
'--eval',
77+
"db.adminCommand('ping')"
78+
]
6879
interval: 10s
6980
timeout: 5s
7081
retries: 5
@@ -271,4 +282,3 @@ networks:
271282
fastgpt:
272283
aiproxy:
273284
vector:
274-

0 commit comments

Comments
 (0)