From 3378420e25b6eee6cf470bfba3228c8afb81a5b6 Mon Sep 17 00:00:00 2001 From: Theresa <63280168+sd0ric4@users.noreply.github.com> Date: Thu, 3 Jul 2025 13:18:54 +0800 Subject: [PATCH] update yaml and yml.js (#5139) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update: modify MINIO_HOST to accept IP or domain and comment out port exposure in docker configuration * update: standardize MINIO_HOST format to accept IP or domain across multiple docker-compose files * update: replace MINIO_HOST with MINIO_ENDPOINT and CUSTOM_CUSTOM_ENDPOINT in multiple docker-compose files * update: standardize environment variable names for MinIO across multiple docker-compose files * update: add additional MinIO environment variables for plugin service configuration in docker documentation * update: standardize table formatting and improve MinIO configuration descriptions in docker documentation * update: 修改 fastgpt-plugin 镜像版本为 v0.1.0 * update: 修改 fastgpt-plugin 中 MINIO_CUSTOM_ENDPOINT 的说明，添加协议前缀 --- deploy/docker/docker-compose-milvus.yml | 3 ++- .../docker-compose.yml | 3 ++- deploy/docker/docker-compose-pgvector.yml | 3 ++- deploy/docker/docker-compose-zilliz.yml | 3 ++- deploy/docker/yml.js | 3 ++- .../content/zh-cn/docs/development/docker.md | 23 ++++++++++--------- .../zh-cn/docs/development/upgrading/4100.md | 2 +- 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/deploy/docker/docker-compose-milvus.yml b/deploy/docker/docker-compose-milvus.yml index 6c12d1b40..5f37a02b9 100644 --- a/deploy/docker/docker-compose-milvus.yml +++ b/deploy/docker/docker-compose-milvus.yml @@ -235,7 +235,8 @@ services: environment: - AUTH_TOKEN=xxxxxx # disable authentication token if you do not set this variable # 改成 minio 公网地址 - - MINIO_HOST= + - MINIO_CUSTOM_ENDPOINT= + - MINIO_ENDPOINT=fastgpt-minio - MINIO_PORT=9000 - MINIO_USE_SSL=false - MINIO_ACCESS_KEY=minioadmin diff --git a/deploy/docker/docker-compose-oceanbase/docker-compose.yml b/deploy/docker/docker-compose-oceanbase/docker-compose.yml index 40a258622..0f1af1bb4 100644 --- a/deploy/docker/docker-compose-oceanbase/docker-compose.yml +++ b/deploy/docker/docker-compose-oceanbase/docker-compose.yml @@ -209,7 +209,8 @@ services: environment: - AUTH_TOKEN=xxxxxx # disable authentication token if you do not set this variable # 改成 minio 公网地址 - - MINIO_HOST= + - MINIO_CUSTOM_ENDPOINT= + - MINIO_ENDPOINT=fastgpt-minio - MINIO_PORT=9000 - MINIO_USE_SSL=false - MINIO_ACCESS_KEY=minioadmin diff --git a/deploy/docker/docker-compose-pgvector.yml b/deploy/docker/docker-compose-pgvector.yml index 067142e27..f5edf1dba 100644 --- a/deploy/docker/docker-compose-pgvector.yml +++ b/deploy/docker/docker-compose-pgvector.yml @@ -195,7 +195,8 @@ services: environment: - AUTH_TOKEN=xxxxxx # disable authentication token if you do not set this variable # 改成 minio 公网地址 - - MINIO_HOST= + - MINIO_CUSTOM_ENDPOINT= + - MINIO_ENDPOINT=fastgpt-minio - MINIO_PORT=9000 - MINIO_USE_SSL=false - MINIO_ACCESS_KEY=minioadmin diff --git a/deploy/docker/docker-compose-zilliz.yml b/deploy/docker/docker-compose-zilliz.yml index 60dd90385..fe947490c 100644 --- a/deploy/docker/docker-compose-zilliz.yml +++ b/deploy/docker/docker-compose-zilliz.yml @@ -177,7 +177,8 @@ services: environment: - AUTH_TOKEN=xxxxxx # disable authentication token if you do not set this variable # 改成 minio 公网地址 - - MINIO_HOST= + - MINIO_CUSTOM_ENDPOINT= + - MINIO_ENDPOINT=fastgpt-minio - MINIO_PORT=9000 - MINIO_USE_SSL=false - MINIO_ACCESS_KEY=minioadmin diff --git a/deploy/docker/yml.js b/deploy/docker/yml.js index 9a5cf4705..828a89499 100644 --- a/deploy/docker/yml.js +++ b/deploy/docker/yml.js @@ -178,7 +178,8 @@ services: environment: - AUTH_TOKEN=xxxxxx # disable authentication token if you do not set this variable # 改成 minio 公网地址 - - MINIO_HOST= + - MINIO_CUSTOM_ENDPOINT= + - MINIO_ENDPOINT=fastgpt-minio - MINIO_PORT=9000 - MINIO_USE_SSL=false - MINIO_ACCESS_KEY=minioadmin diff --git a/docSite/content/zh-cn/docs/development/docker.md b/docSite/content/zh-cn/docs/development/docker.md index 0ec679d2a..cfebea934 100644 --- a/docSite/content/zh-cn/docs/development/docker.md +++ b/docSite/content/zh-cn/docs/development/docker.md @@ -34,11 +34,11 @@ weight: 707 非常轻量，适合知识库索引量在 5000 万以下。 {{< table "table-hover table-striped-columns" >}} -| 环境 | 最低配置（单节点） | 推荐配置 | -| ---- | ---- | ---- | -| 测试（可以把计算进程设置少一些） | 2c4g | 2c8g | -| 100w 组向量 | 4c8g 50GB | 4c16g 50GB | -| 500w 组向量 | 8c32g 200GB | 16c64g 200GB | +| 环境 | 最低配置（单节点） | 推荐配置 | +| -------------------------------- | ------------------ | ------------ | +| 测试（可以把计算进程设置少一些） | 2c4g | 2c8g | +| 100w 组向量 | 4c8g 50GB | 4c16g 50GB | +| 500w 组向量 | 8c32g 200GB | 16c64g 200GB | {{< /table >}} ### Milvus版本 @@ -48,11 +48,11 @@ weight: 707 [点击查看 Milvus 官方推荐配置](https://milvus.io/docs/prerequisite-docker.md) {{< table "table-hover table-striped-columns" >}} -| 环境 | 最低配置（单节点） | 推荐配置 | -| ---- | ---- | ---- | -| 测试 | 2c8g | 4c16g | -| 100w 组向量 | 未测试 | | -| 500w 组向量 | | | +| 环境 | 最低配置（单节点） | 推荐配置 | +| ----------- | ------------------ | -------- | +| 测试 | 2c8g | 4c16g | +| 100w 组向量 | 未测试 | | +| 500w 组向量 | | | {{< /table >}} ### zilliz cloud版本 @@ -169,7 +169,8 @@ DEFAULT_ROOT_PSW=root 用户密码，每次重启root 都会修改成这个密 AES256_SECRET_KEY=密钥加密 key，尽量取复杂密钥，一旦使用后，不能随便修改，否则会导致系统加密的数据无法正常解密 # fastgpt-plugin容器 -MINIO_HOST=minio 公网地址，用于给系统工具提供文件存储。例如 http://ip:9000 +MINIO_CUSTOM_ENDPOINT=http://minio.xxx.com 公网地址，用于给系统工具提供文件存储。填写例如 http://minio.xxx.com 或者 http://: +MINIO_ENDPOINT=fastgpt-minio 这里填写的是 docker-compose.yml 中 fastgpt-minio 的服务名，因为这样 docker 的网络会解析到 minio 的地址 ``` {{< /markdownify >}} diff --git a/docSite/content/zh-cn/docs/development/upgrading/4100.md b/docSite/content/zh-cn/docs/development/upgrading/4100.md index fdedd13bf..049f62849 100644 --- a/docSite/content/zh-cn/docs/development/upgrading/4100.md +++ b/docSite/content/zh-cn/docs/development/upgrading/4100.md @@ -29,7 +29,7 @@ PLUGIN_TOKEN=刚修改的 AUTH_TOKEN 值 ![](/imgs/sealos-s3.png) -- 部署`fastgpt-plugin`服务，镜像`registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1`，无需公网访问，设置环境变量: +- 部署`fastgpt-plugin`服务，镜像`registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.0`，无需公网访问，设置环境变量: ``` AUTH_TOKEN=鉴权 token