diff --git a/deploy/docker/docker-compose-milvus.yml b/deploy/docker/docker-compose-milvus.yml index 5f37a02b9..d1904bcb6 100644 --- a/deploy/docker/docker-compose-milvus.yml +++ b/deploy/docker/docker-compose-milvus.yml @@ -226,16 +226,16 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.1.0 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.0 # 阿里云 + image: ghcr.io/labring/fastgpt-plugin:v0.1.1 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.1 # 阿里云 container_name: fastgpt-plugin restart: always networks: - fastgpt environment: - AUTH_TOKEN=xxxxxx # disable authentication token if you do not set this variable - # 改成 minio 公网地址 - - MINIO_CUSTOM_ENDPOINT= + # 改成 minio 可访问地址，例如 https://192.168.2.2:9000 + - MINIO_CUSTOM_ENDPOINT=https://192.168.2.2:9000 - MINIO_ENDPOINT=fastgpt-minio - MINIO_PORT=9000 - MINIO_USE_SSL=false diff --git a/deploy/docker/docker-compose-oceanbase/docker-compose.yml b/deploy/docker/docker-compose-oceanbase/docker-compose.yml index 0f1af1bb4..74730af80 100644 --- a/deploy/docker/docker-compose-oceanbase/docker-compose.yml +++ b/deploy/docker/docker-compose-oceanbase/docker-compose.yml @@ -200,16 +200,16 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.1.0 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.0 # 阿里云 + image: ghcr.io/labring/fastgpt-plugin:v0.1.1 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.1 # 阿里云 container_name: fastgpt-plugin restart: always networks: - fastgpt environment: - AUTH_TOKEN=xxxxxx # disable authentication token if you do not set this variable - # 改成 minio 公网地址 - - MINIO_CUSTOM_ENDPOINT= + # 改成 minio 可访问地址，例如 https://192.168.2.2:9000 + - MINIO_CUSTOM_ENDPOINT=https://192.168.2.2:9000 - MINIO_ENDPOINT=fastgpt-minio - MINIO_PORT=9000 - MINIO_USE_SSL=false diff --git a/deploy/docker/docker-compose-pgvector.yml b/deploy/docker/docker-compose-pgvector.yml index f5edf1dba..db8ac90b3 100644 --- a/deploy/docker/docker-compose-pgvector.yml +++ b/deploy/docker/docker-compose-pgvector.yml @@ -186,16 +186,16 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.1.0 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.0 # 阿里云 + image: ghcr.io/labring/fastgpt-plugin:v0.1.1 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.1 # 阿里云 container_name: fastgpt-plugin restart: always networks: - fastgpt environment: - AUTH_TOKEN=xxxxxx # disable authentication token if you do not set this variable - # 改成 minio 公网地址 - - MINIO_CUSTOM_ENDPOINT= + # 改成 minio 可访问地址，例如 https://192.168.2.2:9000 + - MINIO_CUSTOM_ENDPOINT=https://192.168.2.2:9000 - MINIO_ENDPOINT=fastgpt-minio - MINIO_PORT=9000 - MINIO_USE_SSL=false diff --git a/deploy/docker/docker-compose-zilliz.yml b/deploy/docker/docker-compose-zilliz.yml index fe947490c..c06a9ba73 100644 --- a/deploy/docker/docker-compose-zilliz.yml +++ b/deploy/docker/docker-compose-zilliz.yml @@ -168,16 +168,16 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.1.0 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.0 # 阿里云 + image: ghcr.io/labring/fastgpt-plugin:v0.1.1 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.1 # 阿里云 container_name: fastgpt-plugin restart: always networks: - fastgpt environment: - AUTH_TOKEN=xxxxxx # disable authentication token if you do not set this variable - # 改成 minio 公网地址 - - MINIO_CUSTOM_ENDPOINT= + # 改成 minio 可访问地址，例如 https://192.168.2.2:9000 + - MINIO_CUSTOM_ENDPOINT=https://192.168.2.2:9000 - MINIO_ENDPOINT=fastgpt-minio - MINIO_PORT=9000 - MINIO_USE_SSL=false diff --git a/deploy/docker/yml.js b/deploy/docker/yml.js index 828a89499..6013f02aa 100644 --- a/deploy/docker/yml.js +++ b/deploy/docker/yml.js @@ -169,16 +169,16 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.1.0 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.0 # 阿里云 + image: ghcr.io/labring/fastgpt-plugin:v0.1.1 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.1 # 阿里云 container_name: fastgpt-plugin restart: always networks: - fastgpt environment: - AUTH_TOKEN=xxxxxx # disable authentication token if you do not set this variable - # 改成 minio 公网地址 - - MINIO_CUSTOM_ENDPOINT= + # 改成 minio 可访问地址，例如 https://192.168.2.2:9000 + - MINIO_CUSTOM_ENDPOINT=https://192.168.2.2:9000 - MINIO_ENDPOINT=fastgpt-minio - MINIO_PORT=9000 - MINIO_USE_SSL=false diff --git a/docSite/content/zh-cn/docs/development/docker.md b/docSite/content/zh-cn/docs/development/docker.md index cfebea934..706711a01 100644 --- a/docSite/content/zh-cn/docs/development/docker.md +++ b/docSite/content/zh-cn/docs/development/docker.md @@ -169,8 +169,7 @@ DEFAULT_ROOT_PSW=root 用户密码，每次重启root 都会修改成这个密 AES256_SECRET_KEY=密钥加密 key，尽量取复杂密钥，一旦使用后，不能随便修改，否则会导致系统加密的数据无法正常解密 # fastgpt-plugin容器 -MINIO_CUSTOM_ENDPOINT=http://minio.xxx.com 公网地址，用于给系统工具提供文件存储。填写例如 http://minio.xxx.com 或者 http://: -MINIO_ENDPOINT=fastgpt-minio 这里填写的是 docker-compose.yml 中 fastgpt-minio 的服务名，因为这样 docker 的网络会解析到 minio 的地址 +MINIO_CUSTOM_ENDPOINT=http://minio.xxx.com 用户可访问的地址，用于给系统工具提供文件存储。填写例如 http://minio.xxx.com 或者 http://: ``` {{< /markdownify >}} diff --git a/docSite/content/zh-cn/docs/development/upgrading/4100.md b/docSite/content/zh-cn/docs/development/upgrading/4100.md index 049f62849..249b5dfef 100644 --- a/docSite/content/zh-cn/docs/development/upgrading/4100.md +++ b/docSite/content/zh-cn/docs/development/upgrading/4100.md @@ -13,7 +13,7 @@ weight: 785 - 参考最新的[docker-compose.yml](https://github.com/labring/FastGPT/blob/main/deploy/docker/docker-compose-pgvector.yml)文件，加入`fastgpt-plugin`和`minio`服务。 - 修改`fastgpt-plugin`环境变量`AUTH_TOKEN`为较复杂的值。 -- 修改`fastgpt-plugin`环境变量`MINIO_HOST`为`ip:9000` 或相关域名，要求公网可访问。 +- 修改`fastgpt-plugin`环境变量`MINIO_CUSTOM_ENDPOINT`为`http://ip:port` 或相关域名，要求fastgpt 用户可访问。 - 更新`fastgpt`和`fastgpt-pro`(商业版)容器的环境变量: ``` @@ -38,7 +38,8 @@ AUTH_TOKEN=鉴权 token LOG_LEVEL=info # S3 配置 -MINIO_HOST=External +MINIO_CUSTOM_ENDPOINT=External +MINIO_ENDPOINT=Internal地址 MINIO_PORT=443 MINIO_USE_SSL=true MINIO_ACCESS_KEY=Access Key