diff --git a/deploy/dev/docker-compose.cn.yml b/deploy/dev/docker-compose.cn.yml index 624e372431..ef608dda57 100644 --- a/deploy/dev/docker-compose.cn.yml +++ b/deploy/dev/docker-compose.cn.yml @@ -2,12 +2,12 @@ # - 只包含 FastGPT 的最小化运行条件 # - 没有 FastGPT 本体 # - 所有端口都映射到外层 -# - pg: 5432 -# - mongo: 27017 -# - redis: 6379 +# - fastgpt-pg: 5432 +# - fastgpt-mongo: 27017 +# - fastgpt-redis: 6379 # - fastgpt-code-sandbox: 3002 # - fastgpt-plugin: 3003 -# - aiproxy: 3010 +# - fastgpt-aiproxy: 3010 # - 使用 pgvector 作为默认的向量库 # plugin auth token @@ -20,9 +20,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -44,9 +44,9 @@ x-log-config: &x-log-config services: # Vector DB - pg: + fastgpt-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 - container_name: pg + container_name: fastgpt-pg restart: always ports: # 生产环境建议不要暴露 - 5432:5432 @@ -66,9 +66,9 @@ services: retries: 10 # DB - mongo: + fastgpt-mongo: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always ports: - 27017:27017 @@ -110,7 +110,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -128,9 +128,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis ports: - 6379:6379 networks: @@ -166,8 +166,8 @@ services: interval: 30s timeout: 20s retries: 3 - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-code-sandbox:v4.14.10 ports: - 3002:3000 @@ -251,9 +251,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always ports: - 8090:8090 @@ -272,9 +272,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always ports: - 3005:3000 @@ -300,20 +300,20 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped ports: - 3010:3000 depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -324,7 +324,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -336,10 +336,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/dev/docker-compose.yml b/deploy/dev/docker-compose.yml index fd178be80f..742d4d499d 100644 --- a/deploy/dev/docker-compose.yml +++ b/deploy/dev/docker-compose.yml @@ -2,12 +2,12 @@ # - 只包含 FastGPT 的最小化运行条件 # - 没有 FastGPT 本体 # - 所有端口都映射到外层 -# - pg: 5432 -# - mongo: 27017 -# - redis: 6379 +# - fastgpt-pg: 5432 +# - fastgpt-mongo: 27017 +# - fastgpt-redis: 6379 # - fastgpt-code-sandbox: 3002 # - fastgpt-plugin: 3003 -# - aiproxy: 3010 +# - fastgpt-aiproxy: 3010 # - 使用 pgvector 作为默认的向量库 # plugin auth token @@ -20,9 +20,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -44,9 +44,9 @@ x-log-config: &x-log-config services: # Vector DB - pg: + fastgpt-pg: image: pgvector/pgvector:0.8.0-pg15 - container_name: pg + container_name: fastgpt-pg restart: always ports: # 生产环境建议不要暴露 - 5432:5432 @@ -66,9 +66,9 @@ services: retries: 10 # DB - mongo: + fastgpt-mongo: image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always ports: - 27017:27017 @@ -110,7 +110,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -128,9 +128,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis ports: - 6379:6379 networks: @@ -166,8 +166,8 @@ services: interval: 30s timeout: 20s retries: 3 - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ghcr.io/labring/fastgpt-code-sandbox:v4.14.10 ports: - 3002:3000 @@ -251,9 +251,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always ports: - 8090:8090 @@ -272,9 +272,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always ports: - 3005:3000 @@ -300,20 +300,20 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: undefined:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ghcr.io/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped ports: - 3010:3000 depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -324,7 +324,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -336,10 +336,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: pgvector/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/docker/cn/docker-compose.milvus.yml b/deploy/docker/cn/docker-compose.milvus.yml index 347224bb7a..8808976b6a 100644 --- a/deploy/docker/cn/docker-compose.milvus.yml +++ b/deploy/docker/cn/docker-compose.milvus.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - MILVUS_ADDRESS: http://milvusStandalone:19530 + MILVUS_ADDRESS: http://fastgpt-milvus-standalone:19530 MILVUS_TOKEN: none services: # Vector DB - milvus-minio: - container_name: milvus-minio + fastgpt-milvus-minio: + container_name: fastgpt-milvus-minio image: minio/minio:RELEASE.2023-03-20T20-16-18Z environment: MINIO_ACCESS_KEY: minioadmin @@ -64,8 +64,8 @@ services: timeout: 20s retries: 3 # milvus - milvus-etcd: - container_name: milvus-etcd + fastgpt-milvus-etcd: + container_name: fastgpt-milvus-etcd image: quay.io/coreos/etcd:v3.5.5 environment: - ETCD_AUTO_COMPACTION_MODE=revision @@ -82,15 +82,15 @@ services: interval: 30s timeout: 20s retries: 3 - vectorDB: - container_name: milvusStandalone + fastgpt-milvus-standalone: + container_name: fastgpt-milvus-standalone image: milvusdb/milvus:v2.4.3 command: ['milvus', 'run', 'standalone'] security_opt: - seccomp:unconfined environment: - ETCD_ENDPOINTS: milvus-etcd:2379 - MINIO_ADDRESS: milvus-minio:9000 + ETCD_ENDPOINTS: fastgpt-milvus-etcd:2379 + MINIO_ADDRESS: fastgpt-milvus-minio:9000 networks: - fastgpt - vector @@ -103,12 +103,12 @@ services: timeout: 20s retries: 3 depends_on: - - 'milvus-etcd' - - 'milvus-minio' + - 'fastgpt-milvus-etcd' + - 'fastgpt-milvus-minio' - mongo: + fastgpt-mongo: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -136,7 +136,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -154,9 +154,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -199,9 +199,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-milvus-standalone + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -229,24 +230,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -278,8 +279,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -361,9 +362,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -380,9 +381,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -407,18 +408,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -429,7 +430,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -441,10 +442,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/docker/cn/docker-compose.oceanbase.yml b/deploy/docker/cn/docker-compose.oceanbase.yml index 732264f0d9..2aafaf1f7a 100644 --- a/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/deploy/docker/cn/docker-compose.oceanbase.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/mysql + OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-ob:2881/mysql services: # Vector DB - vectorDB: + fastgpt-ob: image: oceanbase/oceanbase-ce:4.3.5-lts - container_name: ob + container_name: fastgpt-ob restart: always # ports: # 生产环境建议不要暴露 # - 2881:2881 @@ -83,9 +83,9 @@ services: retries: 1000 start_period: 10s - mongo: + fastgpt-mongo: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -113,7 +113,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -131,9 +131,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -176,9 +176,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-ob + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -206,24 +207,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -255,8 +256,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -338,9 +339,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -357,9 +358,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -384,18 +385,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -406,7 +407,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -418,10 +419,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/docker/cn/docker-compose.pg.yml b/deploy/docker/cn/docker-compose.pg.yml index 67b2f00a15..5156e72e08 100644 --- a/deploy/docker/cn/docker-compose.pg.yml +++ b/deploy/docker/cn/docker-compose.pg.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,13 +41,13 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - PG_URL: postgresql://username:password@pg:5432/postgres + PG_URL: postgresql://username:password@fastgpt-pg:5432/postgres services: # Vector DB - vectorDB: + fastgpt-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 - container_name: pg + container_name: fastgpt-pg restart: always networks: - fastgpt @@ -64,9 +64,9 @@ services: timeout: 5s retries: 10 - mongo: + fastgpt-mongo: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -94,7 +94,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -112,9 +112,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -157,9 +157,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-pg + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -187,24 +188,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -236,8 +237,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -319,9 +320,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -338,9 +339,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -365,18 +366,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -387,7 +388,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -399,10 +400,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/docker/cn/docker-compose.seekdb.yml b/deploy/docker/cn/docker-compose.seekdb.yml index 32791c2e4a..602baddab5 100644 --- a/deploy/docker/cn/docker-compose.seekdb.yml +++ b/deploy/docker/cn/docker-compose.seekdb.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - SEEKDB_URL: mysql://root:seekdbpassword@seekdb:2881/mysql + SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-seekdb:2881/mysql services: # Vector DB - vectorDB: + fastgpt-seekdb: image: oceanbase/seekdb:1.0.1.0-100000392025122619 - container_name: seekdb + container_name: fastgpt-seekdb restart: always # ports: # 生产环境建议不要暴露 # - 2881:2881 @@ -70,9 +70,9 @@ services: retries: 1000 start_period: 10s - mongo: + fastgpt-mongo: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -100,7 +100,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -118,9 +118,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -163,9 +163,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-seekdb + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -193,24 +194,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -242,8 +243,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -325,9 +326,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -344,9 +345,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -371,18 +372,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -393,7 +394,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -405,10 +406,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/docker/cn/docker-compose.zilliz.yml b/deploy/docker/cn/docker-compose.zilliz.yml index bba6a20652..cf8c9fbd97 100644 --- a/deploy/docker/cn/docker-compose.zilliz.yml +++ b/deploy/docker/cn/docker-compose.zilliz.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -47,9 +47,9 @@ x-vec-config: &x-vec-config services: # Vector DB - mongo: + fastgpt-mongo: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -77,7 +77,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -95,9 +95,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -140,9 +140,9 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -170,24 +170,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -219,8 +219,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -302,9 +302,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -321,9 +321,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -348,18 +348,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -370,7 +370,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -382,10 +382,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/docker/global/docker-compose.milvus.yml b/deploy/docker/global/docker-compose.milvus.yml index a4176f5185..5afce1f117 100644 --- a/deploy/docker/global/docker-compose.milvus.yml +++ b/deploy/docker/global/docker-compose.milvus.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - MILVUS_ADDRESS: http://milvusStandalone:19530 + MILVUS_ADDRESS: http://fastgpt-milvus-standalone:19530 MILVUS_TOKEN: none services: # Vector DB - milvus-minio: - container_name: milvus-minio + fastgpt-milvus-minio: + container_name: fastgpt-milvus-minio image: minio/minio:RELEASE.2023-03-20T20-16-18Z environment: MINIO_ACCESS_KEY: minioadmin @@ -64,8 +64,8 @@ services: timeout: 20s retries: 3 # milvus - milvus-etcd: - container_name: milvus-etcd + fastgpt-milvus-etcd: + container_name: fastgpt-milvus-etcd image: quay.io/coreos/etcd:v3.5.5 environment: - ETCD_AUTO_COMPACTION_MODE=revision @@ -82,15 +82,15 @@ services: interval: 30s timeout: 20s retries: 3 - vectorDB: - container_name: milvusStandalone + fastgpt-milvus-standalone: + container_name: fastgpt-milvus-standalone image: milvusdb/milvus:v2.4.3 command: ['milvus', 'run', 'standalone'] security_opt: - seccomp:unconfined environment: - ETCD_ENDPOINTS: milvus-etcd:2379 - MINIO_ADDRESS: milvus-minio:9000 + ETCD_ENDPOINTS: fastgpt-milvus-etcd:2379 + MINIO_ADDRESS: fastgpt-milvus-minio:9000 networks: - fastgpt - vector @@ -103,12 +103,12 @@ services: timeout: 20s retries: 3 depends_on: - - 'milvus-etcd' - - 'milvus-minio' + - 'fastgpt-milvus-etcd' + - 'fastgpt-milvus-minio' - mongo: + fastgpt-mongo: image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -136,7 +136,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -154,9 +154,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -199,9 +199,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-milvus-standalone + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -229,24 +230,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -278,8 +279,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ghcr.io/labring/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -361,9 +362,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -380,9 +381,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -407,18 +408,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: undefined:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ghcr.io/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -429,7 +430,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -441,10 +442,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: pgvector/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/docker/global/docker-compose.oceanbase.yml b/deploy/docker/global/docker-compose.oceanbase.yml index a870332fdf..475747447a 100644 --- a/deploy/docker/global/docker-compose.oceanbase.yml +++ b/deploy/docker/global/docker-compose.oceanbase.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/mysql + OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-ob:2881/mysql services: # Vector DB - vectorDB: + fastgpt-ob: image: oceanbase/oceanbase-ce:4.3.5-lts - container_name: ob + container_name: fastgpt-ob restart: always # ports: # 生产环境建议不要暴露 # - 2881:2881 @@ -83,9 +83,9 @@ services: retries: 1000 start_period: 10s - mongo: + fastgpt-mongo: image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -113,7 +113,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -131,9 +131,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -176,9 +176,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-ob + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -206,24 +207,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -255,8 +256,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ghcr.io/labring/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -338,9 +339,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -357,9 +358,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -384,18 +385,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: undefined:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ghcr.io/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -406,7 +407,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -418,10 +419,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: pgvector/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/docker/global/docker-compose.pg.yml b/deploy/docker/global/docker-compose.pg.yml index ff9d823a6d..d6047f2564 100644 --- a/deploy/docker/global/docker-compose.pg.yml +++ b/deploy/docker/global/docker-compose.pg.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,13 +41,13 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - PG_URL: postgresql://username:password@pg:5432/postgres + PG_URL: postgresql://username:password@fastgpt-pg:5432/postgres services: # Vector DB - vectorDB: + fastgpt-pg: image: pgvector/pgvector:0.8.0-pg15 - container_name: pg + container_name: fastgpt-pg restart: always networks: - fastgpt @@ -64,9 +64,9 @@ services: timeout: 5s retries: 10 - mongo: + fastgpt-mongo: image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -94,7 +94,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -112,9 +112,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -157,9 +157,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-pg + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -187,24 +188,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -236,8 +237,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ghcr.io/labring/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -319,9 +320,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -338,9 +339,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -365,18 +366,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: undefined:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ghcr.io/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -387,7 +388,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -399,10 +400,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: pgvector/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/docker/global/docker-compose.seekdb.yml b/deploy/docker/global/docker-compose.seekdb.yml index 75c2803f48..8317e136af 100644 --- a/deploy/docker/global/docker-compose.seekdb.yml +++ b/deploy/docker/global/docker-compose.seekdb.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - SEEKDB_URL: mysql://root:seekdbpassword@seekdb:2881/mysql + SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-seekdb:2881/mysql services: # Vector DB - vectorDB: + fastgpt-seekdb: image: oceanbase/seekdb:1.0.1.0-100000392025122619 - container_name: seekdb + container_name: fastgpt-seekdb restart: always # ports: # 生产环境建议不要暴露 # - 2881:2881 @@ -70,9 +70,9 @@ services: retries: 1000 start_period: 10s - mongo: + fastgpt-mongo: image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -100,7 +100,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -118,9 +118,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -163,9 +163,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-seekdb + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -193,24 +194,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -242,8 +243,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ghcr.io/labring/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -325,9 +326,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -344,9 +345,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -371,18 +372,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: undefined:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ghcr.io/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -393,7 +394,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -405,10 +406,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: pgvector/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/docker/global/docker-compose.ziliiz.yml b/deploy/docker/global/docker-compose.ziliiz.yml index c99296c9e1..cee5282a20 100644 --- a/deploy/docker/global/docker-compose.ziliiz.yml +++ b/deploy/docker/global/docker-compose.ziliiz.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -47,9 +47,9 @@ x-vec-config: &x-vec-config services: # Vector DB - mongo: + fastgpt-mongo: image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -77,7 +77,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -95,9 +95,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -140,9 +140,9 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -170,24 +170,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -219,8 +219,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ghcr.io/labring/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -302,9 +302,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -321,9 +321,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -348,18 +348,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: undefined:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ghcr.io/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -370,7 +370,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -382,10 +382,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: pgvector/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/init.mjs b/deploy/init.mjs index ae5d38b8b0..b7bba3dfe4 100644 --- a/deploy/init.mjs +++ b/deploy/init.mjs @@ -53,20 +53,30 @@ const args = (() => { const vector = { pg: { + serviceName: 'fastgpt-pg', + dependsOn: `\ + - fastgpt-pg +`, db: '', config: `\ - PG_URL: postgresql://username:password@pg:5432/postgres`, + PG_URL: postgresql://username:password@fastgpt-pg:5432/postgres`, extra: '' }, milvus: { + serviceName: 'fastgpt-milvus-standalone', + dependsOn: `\ + - fastgpt-milvus-standalone +`, db: '', config: `\ - MILVUS_ADDRESS: http://milvusStandalone:19530 + MILVUS_ADDRESS: http://fastgpt-milvus-standalone:19530 MILVUS_TOKEN: none `, extra: '' }, zilliz: { + serviceName: '', + dependsOn: '', db: '', config: `\ MILVUS_ADDRESS: zilliz_cloud_address @@ -74,9 +84,13 @@ const vector = { extra: '' }, ob: { + serviceName: 'fastgpt-ob', + dependsOn: `\ + - fastgpt-ob +`, db: '', config: `\ - OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/mysql + OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-ob:2881/mysql `, extra: `\ init_sql: @@ -86,9 +100,13 @@ init_sql: ` }, seekdb: { + serviceName: 'fastgpt-seekdb', + dependsOn: `\ + - fastgpt-seekdb +`, db: '', config: `\ - SEEKDB_URL: mysql://root:seekdbpassword@seekdb:2881/mysql + SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-seekdb:2881/mysql `, extra: `` }, diff --git a/deploy/templates/docker-compose.dev.yml b/deploy/templates/docker-compose.dev.yml index 8962d3b157..3a95972cfe 100644 --- a/deploy/templates/docker-compose.dev.yml +++ b/deploy/templates/docker-compose.dev.yml @@ -2,12 +2,12 @@ # - 只包含 FastGPT 的最小化运行条件 # - 没有 FastGPT 本体 # - 所有端口都映射到外层 -# - pg: 5432 -# - mongo: 27017 -# - redis: 6379 +# - fastgpt-pg: 5432 +# - fastgpt-mongo: 27017 +# - fastgpt-redis: 6379 # - fastgpt-code-sandbox: 3002 # - fastgpt-plugin: 3003 -# - aiproxy: 3010 +# - fastgpt-aiproxy: 3010 # - 使用 pgvector 作为默认的向量库 # plugin auth token @@ -20,9 +20,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -44,9 +44,9 @@ x-log-config: &x-log-config services: # Vector DB - pg: + fastgpt-pg: image: ${{pg.image}}:${{pg.tag}} - container_name: pg + container_name: fastgpt-pg restart: always ports: # 生产环境建议不要暴露 - 5432:5432 @@ -66,9 +66,9 @@ services: retries: 10 # DB - mongo: + fastgpt-mongo: image: ${{mongo.image}}:${{mongo.tag}} # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always ports: - 27017:27017 @@ -110,7 +110,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -128,9 +128,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: ${{redis.image}}:${{redis.tag}} - container_name: redis + container_name: fastgpt-redis ports: - 6379:6379 networks: @@ -166,8 +166,8 @@ services: interval: 30s timeout: 20s retries: 3 - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ${{fastgpt-code-sandbox.image}}:${{fastgpt-code-sandbox.tag}} ports: - 3002:3000 @@ -251,9 +251,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always ports: - 8090:8090 @@ -272,9 +272,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ${{volume-manager.image}}:${{volume-manager.tag}} - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always ports: - 3005:3000 @@ -300,20 +300,20 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: ${{agent-sandbox-image.image}}:${{agent-sandbox-image.tag}} profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ${{aiproxy.image}}:${{aiproxy.tag}} - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped ports: - 3010:3000 depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -324,7 +324,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -336,10 +336,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: ${{aiproxy-pg.image}}:${{aiproxy-pg.tag}} # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/templates/docker-compose.prod.yml b/deploy/templates/docker-compose.prod.yml index 849009e6b6..9da679db47 100644 --- a/deploy/templates/docker-compose.prod.yml +++ b/deploy/templates/docker-compose.prod.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -46,9 +46,9 @@ ${{vec.config}} services: # Vector DB ${{vec.db}} - mongo: + fastgpt-mongo: image: ${{mongo.image}}:${{mongo.tag}} # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -76,7 +76,7 @@ ${{vec.db}} rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -94,9 +94,9 @@ ${{vec.db}} # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: ${{redis.image}}:${{redis.tag}} - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -139,9 +139,9 @@ ${{vec.db}} networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox +${{vec.dependsOn}} restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -169,24 +169,24 @@ ${{vec.db}} PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: ${{agent-sandbox-image.image}} AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: ${{agent-sandbox-image.tag}} # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -218,8 +218,8 @@ ${{vec.db}} MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ${{fastgpt-code-sandbox.image}}:${{fastgpt-code-sandbox.tag}} networks: - fastgpt @@ -301,9 +301,9 @@ ${{vec.db}} # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -320,9 +320,9 @@ ${{vec.db}} timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ${{volume-manager.image}}:${{volume-manager.tag}} - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -347,18 +347,18 @@ ${{vec.db}} timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: ${{agent-sandbox-image.image}}:${{agent-sandbox-image.tag}} profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ${{aiproxy.image}}:${{aiproxy.tag}} - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -369,7 +369,7 @@ ${{vec.db}} # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -381,10 +381,10 @@ ${{vec.db}} interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: ${{aiproxy-pg.image}}:${{aiproxy-pg.tag}} # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/deploy/templates/vector/milvus.txt b/deploy/templates/vector/milvus.txt index 7f60f54fdf..03fcfb82a1 100644 --- a/deploy/templates/vector/milvus.txt +++ b/deploy/templates/vector/milvus.txt @@ -1,5 +1,5 @@ - milvus-minio: - container_name: milvus-minio + fastgpt-milvus-minio: + container_name: fastgpt-milvus-minio image: ${{milvus-minio.image}}:${{milvus-minio.tag}} environment: MINIO_ACCESS_KEY: minioadmin @@ -15,8 +15,8 @@ timeout: 20s retries: 3 # milvus - milvus-etcd: - container_name: milvus-etcd + fastgpt-milvus-etcd: + container_name: fastgpt-milvus-etcd image: ${{milvus-etcd.image}}:${{milvus-etcd.tag}} environment: - ETCD_AUTO_COMPACTION_MODE=revision @@ -33,15 +33,15 @@ interval: 30s timeout: 20s retries: 3 - vectorDB: - container_name: milvusStandalone + fastgpt-milvus-standalone: + container_name: fastgpt-milvus-standalone image: ${{milvus-standalone.image}}:${{milvus-standalone.tag}} command: ['milvus', 'run', 'standalone'] security_opt: - seccomp:unconfined environment: - ETCD_ENDPOINTS: milvus-etcd:2379 - MINIO_ADDRESS: milvus-minio:9000 + ETCD_ENDPOINTS: fastgpt-milvus-etcd:2379 + MINIO_ADDRESS: fastgpt-milvus-minio:9000 networks: - fastgpt - vector @@ -54,5 +54,5 @@ timeout: 20s retries: 3 depends_on: - - 'milvus-etcd' - - 'milvus-minio' + - 'fastgpt-milvus-etcd' + - 'fastgpt-milvus-minio' diff --git a/deploy/templates/vector/ob.txt b/deploy/templates/vector/ob.txt index 0a9cc06b16..d18f1241d0 100644 --- a/deploy/templates/vector/ob.txt +++ b/deploy/templates/vector/ob.txt @@ -1,6 +1,6 @@ - vectorDB: + fastgpt-ob: image: ${{oceanbase.image}}:${{oceanbase.tag}} - container_name: ob + container_name: fastgpt-ob restart: always # ports: # 生产环境建议不要暴露 # - 2881:2881 diff --git a/deploy/templates/vector/pg.txt b/deploy/templates/vector/pg.txt index 4714f0057e..28e2467063 100644 --- a/deploy/templates/vector/pg.txt +++ b/deploy/templates/vector/pg.txt @@ -1,6 +1,6 @@ - vectorDB: + fastgpt-pg: image: ${{pg.image}}:${{pg.tag}} - container_name: pg + container_name: fastgpt-pg restart: always networks: - fastgpt diff --git a/deploy/templates/vector/seekdb.txt b/deploy/templates/vector/seekdb.txt index ce8fe03c9c..3415bff838 100644 --- a/deploy/templates/vector/seekdb.txt +++ b/deploy/templates/vector/seekdb.txt @@ -1,6 +1,6 @@ - vectorDB: + fastgpt-seekdb: image: ${{seekdb.image}}:${{seekdb.tag}} - container_name: seekdb + container_name: fastgpt-seekdb restart: always # ports: # 生产环境建议不要暴露 # - 2881:2881 diff --git a/document/public/deploy/docker/cn/docker-compose.milvus.yml b/document/public/deploy/docker/cn/docker-compose.milvus.yml index 347224bb7a..8808976b6a 100644 --- a/document/public/deploy/docker/cn/docker-compose.milvus.yml +++ b/document/public/deploy/docker/cn/docker-compose.milvus.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - MILVUS_ADDRESS: http://milvusStandalone:19530 + MILVUS_ADDRESS: http://fastgpt-milvus-standalone:19530 MILVUS_TOKEN: none services: # Vector DB - milvus-minio: - container_name: milvus-minio + fastgpt-milvus-minio: + container_name: fastgpt-milvus-minio image: minio/minio:RELEASE.2023-03-20T20-16-18Z environment: MINIO_ACCESS_KEY: minioadmin @@ -64,8 +64,8 @@ services: timeout: 20s retries: 3 # milvus - milvus-etcd: - container_name: milvus-etcd + fastgpt-milvus-etcd: + container_name: fastgpt-milvus-etcd image: quay.io/coreos/etcd:v3.5.5 environment: - ETCD_AUTO_COMPACTION_MODE=revision @@ -82,15 +82,15 @@ services: interval: 30s timeout: 20s retries: 3 - vectorDB: - container_name: milvusStandalone + fastgpt-milvus-standalone: + container_name: fastgpt-milvus-standalone image: milvusdb/milvus:v2.4.3 command: ['milvus', 'run', 'standalone'] security_opt: - seccomp:unconfined environment: - ETCD_ENDPOINTS: milvus-etcd:2379 - MINIO_ADDRESS: milvus-minio:9000 + ETCD_ENDPOINTS: fastgpt-milvus-etcd:2379 + MINIO_ADDRESS: fastgpt-milvus-minio:9000 networks: - fastgpt - vector @@ -103,12 +103,12 @@ services: timeout: 20s retries: 3 depends_on: - - 'milvus-etcd' - - 'milvus-minio' + - 'fastgpt-milvus-etcd' + - 'fastgpt-milvus-minio' - mongo: + fastgpt-mongo: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -136,7 +136,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -154,9 +154,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -199,9 +199,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-milvus-standalone + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -229,24 +230,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -278,8 +279,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -361,9 +362,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -380,9 +381,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -407,18 +408,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -429,7 +430,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -441,10 +442,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml index 732264f0d9..2aafaf1f7a 100644 --- a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/mysql + OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-ob:2881/mysql services: # Vector DB - vectorDB: + fastgpt-ob: image: oceanbase/oceanbase-ce:4.3.5-lts - container_name: ob + container_name: fastgpt-ob restart: always # ports: # 生产环境建议不要暴露 # - 2881:2881 @@ -83,9 +83,9 @@ services: retries: 1000 start_period: 10s - mongo: + fastgpt-mongo: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -113,7 +113,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -131,9 +131,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -176,9 +176,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-ob + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -206,24 +207,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -255,8 +256,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -338,9 +339,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -357,9 +358,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -384,18 +385,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -406,7 +407,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -418,10 +419,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/document/public/deploy/docker/cn/docker-compose.pg.yml b/document/public/deploy/docker/cn/docker-compose.pg.yml index 67b2f00a15..5156e72e08 100644 --- a/document/public/deploy/docker/cn/docker-compose.pg.yml +++ b/document/public/deploy/docker/cn/docker-compose.pg.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,13 +41,13 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - PG_URL: postgresql://username:password@pg:5432/postgres + PG_URL: postgresql://username:password@fastgpt-pg:5432/postgres services: # Vector DB - vectorDB: + fastgpt-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 - container_name: pg + container_name: fastgpt-pg restart: always networks: - fastgpt @@ -64,9 +64,9 @@ services: timeout: 5s retries: 10 - mongo: + fastgpt-mongo: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -94,7 +94,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -112,9 +112,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -157,9 +157,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-pg + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -187,24 +188,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -236,8 +237,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -319,9 +320,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -338,9 +339,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -365,18 +366,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -387,7 +388,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -399,10 +400,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/document/public/deploy/docker/cn/docker-compose.seekdb.yml b/document/public/deploy/docker/cn/docker-compose.seekdb.yml index 32791c2e4a..602baddab5 100644 --- a/document/public/deploy/docker/cn/docker-compose.seekdb.yml +++ b/document/public/deploy/docker/cn/docker-compose.seekdb.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - SEEKDB_URL: mysql://root:seekdbpassword@seekdb:2881/mysql + SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-seekdb:2881/mysql services: # Vector DB - vectorDB: + fastgpt-seekdb: image: oceanbase/seekdb:1.0.1.0-100000392025122619 - container_name: seekdb + container_name: fastgpt-seekdb restart: always # ports: # 生产环境建议不要暴露 # - 2881:2881 @@ -70,9 +70,9 @@ services: retries: 1000 start_period: 10s - mongo: + fastgpt-mongo: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -100,7 +100,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -118,9 +118,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -163,9 +163,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-seekdb + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -193,24 +194,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -242,8 +243,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -325,9 +326,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -344,9 +345,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -371,18 +372,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -393,7 +394,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -405,10 +406,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/document/public/deploy/docker/cn/docker-compose.zilliz.yml b/document/public/deploy/docker/cn/docker-compose.zilliz.yml index bba6a20652..cf8c9fbd97 100644 --- a/document/public/deploy/docker/cn/docker-compose.zilliz.yml +++ b/document/public/deploy/docker/cn/docker-compose.zilliz.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -47,9 +47,9 @@ x-vec-config: &x-vec-config services: # Vector DB - mongo: + fastgpt-mongo: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -77,7 +77,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -95,9 +95,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -140,9 +140,9 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -170,24 +170,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -219,8 +219,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -302,9 +302,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -321,9 +321,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -348,18 +348,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-agent-sandbox:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -370,7 +370,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -382,10 +382,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/document/public/deploy/docker/global/docker-compose.milvus.yml b/document/public/deploy/docker/global/docker-compose.milvus.yml index a4176f5185..5afce1f117 100644 --- a/document/public/deploy/docker/global/docker-compose.milvus.yml +++ b/document/public/deploy/docker/global/docker-compose.milvus.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - MILVUS_ADDRESS: http://milvusStandalone:19530 + MILVUS_ADDRESS: http://fastgpt-milvus-standalone:19530 MILVUS_TOKEN: none services: # Vector DB - milvus-minio: - container_name: milvus-minio + fastgpt-milvus-minio: + container_name: fastgpt-milvus-minio image: minio/minio:RELEASE.2023-03-20T20-16-18Z environment: MINIO_ACCESS_KEY: minioadmin @@ -64,8 +64,8 @@ services: timeout: 20s retries: 3 # milvus - milvus-etcd: - container_name: milvus-etcd + fastgpt-milvus-etcd: + container_name: fastgpt-milvus-etcd image: quay.io/coreos/etcd:v3.5.5 environment: - ETCD_AUTO_COMPACTION_MODE=revision @@ -82,15 +82,15 @@ services: interval: 30s timeout: 20s retries: 3 - vectorDB: - container_name: milvusStandalone + fastgpt-milvus-standalone: + container_name: fastgpt-milvus-standalone image: milvusdb/milvus:v2.4.3 command: ['milvus', 'run', 'standalone'] security_opt: - seccomp:unconfined environment: - ETCD_ENDPOINTS: milvus-etcd:2379 - MINIO_ADDRESS: milvus-minio:9000 + ETCD_ENDPOINTS: fastgpt-milvus-etcd:2379 + MINIO_ADDRESS: fastgpt-milvus-minio:9000 networks: - fastgpt - vector @@ -103,12 +103,12 @@ services: timeout: 20s retries: 3 depends_on: - - 'milvus-etcd' - - 'milvus-minio' + - 'fastgpt-milvus-etcd' + - 'fastgpt-milvus-minio' - mongo: + fastgpt-mongo: image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -136,7 +136,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -154,9 +154,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -199,9 +199,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-milvus-standalone + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -229,24 +230,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -278,8 +279,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ghcr.io/labring/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -361,9 +362,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -380,9 +381,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -407,18 +408,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: undefined:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ghcr.io/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -429,7 +430,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -441,10 +442,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: pgvector/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/document/public/deploy/docker/global/docker-compose.oceanbase.yml b/document/public/deploy/docker/global/docker-compose.oceanbase.yml index a870332fdf..475747447a 100644 --- a/document/public/deploy/docker/global/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/global/docker-compose.oceanbase.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/mysql + OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-ob:2881/mysql services: # Vector DB - vectorDB: + fastgpt-ob: image: oceanbase/oceanbase-ce:4.3.5-lts - container_name: ob + container_name: fastgpt-ob restart: always # ports: # 生产环境建议不要暴露 # - 2881:2881 @@ -83,9 +83,9 @@ services: retries: 1000 start_period: 10s - mongo: + fastgpt-mongo: image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -113,7 +113,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -131,9 +131,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -176,9 +176,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-ob + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -206,24 +207,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -255,8 +256,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ghcr.io/labring/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -338,9 +339,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -357,9 +358,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -384,18 +385,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: undefined:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ghcr.io/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -406,7 +407,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -418,10 +419,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: pgvector/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/document/public/deploy/docker/global/docker-compose.pg.yml b/document/public/deploy/docker/global/docker-compose.pg.yml index ff9d823a6d..d6047f2564 100644 --- a/document/public/deploy/docker/global/docker-compose.pg.yml +++ b/document/public/deploy/docker/global/docker-compose.pg.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,13 +41,13 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - PG_URL: postgresql://username:password@pg:5432/postgres + PG_URL: postgresql://username:password@fastgpt-pg:5432/postgres services: # Vector DB - vectorDB: + fastgpt-pg: image: pgvector/pgvector:0.8.0-pg15 - container_name: pg + container_name: fastgpt-pg restart: always networks: - fastgpt @@ -64,9 +64,9 @@ services: timeout: 5s retries: 10 - mongo: + fastgpt-mongo: image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -94,7 +94,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -112,9 +112,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -157,9 +157,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-pg + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -187,24 +188,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -236,8 +237,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ghcr.io/labring/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -319,9 +320,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -338,9 +339,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -365,18 +366,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: undefined:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ghcr.io/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -387,7 +388,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -399,10 +400,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: pgvector/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/document/public/deploy/docker/global/docker-compose.seekdb.yml b/document/public/deploy/docker/global/docker-compose.seekdb.yml index 75c2803f48..8317e136af 100644 --- a/document/public/deploy/docker/global/docker-compose.seekdb.yml +++ b/document/public/deploy/docker/global/docker-compose.seekdb.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -41,14 +41,14 @@ x-log-config: &x-log-config # 向量库相关配置 x-vec-config: &x-vec-config - SEEKDB_URL: mysql://root:seekdbpassword@seekdb:2881/mysql + SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-seekdb:2881/mysql services: # Vector DB - vectorDB: + fastgpt-seekdb: image: oceanbase/seekdb:1.0.1.0-100000392025122619 - container_name: seekdb + container_name: fastgpt-seekdb restart: always # ports: # 生产环境建议不要暴露 # - 2881:2881 @@ -70,9 +70,9 @@ services: retries: 1000 start_period: 10s - mongo: + fastgpt-mongo: image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -100,7 +100,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -118,9 +118,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -163,9 +163,10 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + - fastgpt-seekdb + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -193,24 +194,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -242,8 +243,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ghcr.io/labring/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -325,9 +326,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -344,9 +345,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -371,18 +372,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: undefined:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ghcr.io/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -393,7 +394,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -405,10 +406,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: pgvector/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: diff --git a/document/public/deploy/docker/global/docker-compose.ziliiz.yml b/document/public/deploy/docker/global/docker-compose.ziliiz.yml index c99296c9e1..cee5282a20 100644 --- a/document/public/deploy/docker/global/docker-compose.ziliiz.yml +++ b/document/public/deploy/docker/global/docker-compose.ziliiz.yml @@ -17,9 +17,9 @@ x-volume-manager-auth-token: &x-volume-manager-auth-token 'vmtoken' x-aiproxy-token: &x-aiproxy-token 'token' # 数据库连接相关配置 x-share-db-config: &x-share-db-config - MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin + MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 - REDIS_URL: redis://default:mypassword@redis:6379 + REDIS_URL: redis://default:mypassword@fastgpt-redis:6379 # @see https://doc.fastgpt.cn/docs/self-host/config/object-storage STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss STORAGE_REGION: us-east-1 @@ -47,9 +47,9 @@ x-vec-config: &x-vec-config services: # Vector DB - mongo: + fastgpt-mongo: image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 - container_name: mongo + container_name: fastgpt-mongo restart: always networks: - fastgpt @@ -77,7 +77,7 @@ services: rs.initiate({ _id: "rs0", members: [ - { _id: 0, host: "mongo:27017" } + { _id: 0, host: "fastgpt-mongo:27017" } ] }) }' > /data/initReplicaSet.js @@ -95,9 +95,9 @@ services: # 等待docker-entrypoint.sh脚本执行的MongoDB服务进程 wait $$! - redis: + fastgpt-redis: image: redis:7.2-alpine - container_name: redis + container_name: fastgpt-redis networks: - fastgpt restart: always @@ -140,9 +140,9 @@ services: networks: - fastgpt depends_on: - - mongo - - code-sandbox - - vectorDB + - fastgpt-mongo + - fastgpt-code-sandbox + restart: always environment: <<: [*x-share-db-config, *x-vec-config, *x-log-config] @@ -170,24 +170,24 @@ services: PLUGIN_BASE_URL: http://fastgpt-plugin:3000 PLUGIN_TOKEN: *x-plugin-auth-token # code-sandbox 地址 - CODE_SANDBOX_URL: http://code-sandbox:3000 + CODE_SANDBOX_URL: http://fastgpt-code-sandbox:3000 CODE_SANDBOX_TOKEN: *x-code-sandbox-token # AI Proxy 的地址，如果配了该地址，优先使用 - AIPROXY_API_ENDPOINT: http://aiproxy:3000 + AIPROXY_API_ENDPOINT: http://fastgpt-aiproxy:3000 # AI Proxy 的 Admin Token，与 AI Proxy 中的环境变量 ADMIN_KEY AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== Agent sandbox 配置 ==================== AGENT_SANDBOX_PROVIDER: opensandbox # OpenSandbox 配置（PROVIDER: opensandbox 时生效） - AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://opensandbox-server:8090 + AGENT_SANDBOX_OPENSANDBOX_BASEURL: http://fastgpt-opensandbox-server:8090 AGENT_SANDBOX_OPENSANDBOX_API_KEY: AGENT_SANDBOX_OPENSANDBOX_RUNTIME: docker AGENT_SANDBOX_OPENSANDBOX_IMAGE_REPO: undefined AGENT_SANDBOX_OPENSANDBOX_IMAGE_TAG: v0.1 # Volume 持久化配置（opensandbox provider 下可选） AGENT_SANDBOX_ENABLE_VOLUME: true - AGENT_SANDBOX_VOLUME_MANAGER_URL: http://volume-manager:3000 + AGENT_SANDBOX_VOLUME_MANAGER_URL: http://fastgpt-volume-manager:3000 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN: *x-volume-manager-auth-token # ==================== 日志与监控 ==================== @@ -219,8 +219,8 @@ services: MAX_HTML_TRANSFORM_CHARS: 1000000 volumes: - ./config.json:/app/data/config.json - code-sandbox: - container_name: code-sandbox + fastgpt-code-sandbox: + container_name: fastgpt-code-sandbox image: ghcr.io/labring/fastgpt-code-sandbox:v4.14.10 networks: - fastgpt @@ -302,9 +302,9 @@ services: # 沙盒控制器：管理 Docker 容器的创建/执行/停止/删除 # runtime=docker 模式需要挂载 Docker socket # 配置 docker.host_ip 为宿主机 LAN IP（容器内访问宿主机服务用） - opensandbox-server: + fastgpt-opensandbox-server: image: registry.cn-hangzhou.aliyuncs.com/fastgpt/opensandbox-server:v0.1.9 - container_name: opensandbox-server + container_name: fastgpt-opensandbox-server restart: always networks: - fastgpt @@ -321,9 +321,9 @@ services: timeout: 5s retries: 5 # 卷管理微服务：负责幂等创建/删除 Docker named volume 或 k8s PVC - volume-manager: + fastgpt-volume-manager: image: ghcr.io/labring/fastgpt-agent-volume-manager:v0.1 - container_name: volume-manager + container_name: fastgpt-volume-manager restart: always networks: - fastgpt @@ -348,18 +348,18 @@ services: timeout: 5s retries: 5 # Pre-pull only: not started by `docker compose up` (uses profile `prepull`). - agent-sandbox-image: + fastgpt-agent-sandbox-image: image: undefined:v0.1 profiles: - prepull # AI Proxy - aiproxy: + fastgpt-aiproxy: image: ghcr.io/labring/aiproxy:v0.3.5 - container_name: aiproxy + container_name: fastgpt-aiproxy restart: unless-stopped depends_on: - aiproxy_pg: + fastgpt-aiproxy-pg: condition: service_healthy networks: - fastgpt @@ -370,7 +370,7 @@ services: # 错误日志详情保存时间（小时） LOG_DETAIL_STORAGE_HOURS: 1 # 数据库连接地址 - SQL_DSN: postgres://postgres:aiproxy@aiproxy_pg:5432/aiproxy + SQL_DSN: postgres://postgres:aiproxy@fastgpt-aiproxy-pg:5432/aiproxy # 最大重试次数 RETRY_TIMES: 3 # 不需要计费 @@ -382,10 +382,10 @@ services: interval: 5s timeout: 5s retries: 10 - aiproxy_pg: + fastgpt-aiproxy-pg: image: pgvector/pgvector:0.8.0-pg15 # docker hub restart: unless-stopped - container_name: aiproxy_pg + container_name: fastgpt-aiproxy-pg volumes: - fastgpt-aiproxy_pg:/var/lib/postgresql/data networks: