diff --git a/deploy/docker/cn/docker-compose.milvus.yml b/deploy/docker/cn/docker-compose.milvus.yml index 781eb83779..90b429775e 100644 --- a/deploy/docker/cn/docker-compose.milvus.yml +++ b/deploy/docker/cn/docker-compose.milvus.yml @@ -45,7 +45,6 @@ x-vec-config: &x-vec-config MILVUS_TOKEN: none -version: '3.3' services: # Vector DB milvus-minio: @@ -394,6 +393,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/deploy/docker/cn/docker-compose.oceanbase.yml b/deploy/docker/cn/docker-compose.oceanbase.yml index 44602a03d0..1f70321f75 100644 --- a/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/deploy/docker/cn/docker-compose.oceanbase.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/mysql -version: '3.3' services: # Vector DB vectorDB: @@ -371,6 +370,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/deploy/docker/cn/docker-compose.pg.yml b/deploy/docker/cn/docker-compose.pg.yml index 299dae7d99..895b779772 100644 --- a/deploy/docker/cn/docker-compose.pg.yml +++ b/deploy/docker/cn/docker-compose.pg.yml @@ -43,7 +43,6 @@ x-log-config: &x-log-config x-vec-config: &x-vec-config PG_URL: postgresql://username:password@pg:5432/postgres -version: '3.3' services: # Vector DB vectorDB: @@ -352,6 +351,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/deploy/docker/cn/docker-compose.seekdb.yml b/deploy/docker/cn/docker-compose.seekdb.yml index 32cc7d30b7..e0c5437fa4 100644 --- a/deploy/docker/cn/docker-compose.seekdb.yml +++ b/deploy/docker/cn/docker-compose.seekdb.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config SEEKDB_URL: mysql://root:seekdbpassword@seekdb:2881/mysql -version: '3.3' services: # Vector DB vectorDB: @@ -358,6 +357,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/deploy/docker/cn/docker-compose.zilliz.yml b/deploy/docker/cn/docker-compose.zilliz.yml index 203e5b174c..f99bc7a930 100644 --- a/deploy/docker/cn/docker-compose.zilliz.yml +++ b/deploy/docker/cn/docker-compose.zilliz.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config MILVUS_ADDRESS: zilliz_cloud_address MILVUS_TOKEN: zilliz_cloud_token -version: '3.3' services: # Vector DB @@ -336,6 +335,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/deploy/docker/global/docker-compose.milvus.yml b/deploy/docker/global/docker-compose.milvus.yml index 11d82aa52f..cd9d18167e 100644 --- a/deploy/docker/global/docker-compose.milvus.yml +++ b/deploy/docker/global/docker-compose.milvus.yml @@ -45,7 +45,6 @@ x-vec-config: &x-vec-config MILVUS_TOKEN: none -version: '3.3' services: # Vector DB milvus-minio: @@ -394,6 +393,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/deploy/docker/global/docker-compose.oceanbase.yml b/deploy/docker/global/docker-compose.oceanbase.yml index 9ed38e315f..d0b65f3991 100644 --- a/deploy/docker/global/docker-compose.oceanbase.yml +++ b/deploy/docker/global/docker-compose.oceanbase.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/mysql -version: '3.3' services: # Vector DB vectorDB: @@ -371,6 +370,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/deploy/docker/global/docker-compose.pg.yml b/deploy/docker/global/docker-compose.pg.yml index 130a3b7b62..d59b0e099d 100644 --- a/deploy/docker/global/docker-compose.pg.yml +++ b/deploy/docker/global/docker-compose.pg.yml @@ -43,7 +43,6 @@ x-log-config: &x-log-config x-vec-config: &x-vec-config PG_URL: postgresql://username:password@pg:5432/postgres -version: '3.3' services: # Vector DB vectorDB: @@ -352,6 +351,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/deploy/docker/global/docker-compose.seekdb.yml b/deploy/docker/global/docker-compose.seekdb.yml index 1743fa9339..cc4c00c85e 100644 --- a/deploy/docker/global/docker-compose.seekdb.yml +++ b/deploy/docker/global/docker-compose.seekdb.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config SEEKDB_URL: mysql://root:seekdbpassword@seekdb:2881/mysql -version: '3.3' services: # Vector DB vectorDB: @@ -358,6 +357,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/deploy/docker/global/docker-compose.ziliiz.yml b/deploy/docker/global/docker-compose.ziliiz.yml index c30a5075ed..cee3a9fd49 100644 --- a/deploy/docker/global/docker-compose.ziliiz.yml +++ b/deploy/docker/global/docker-compose.ziliiz.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config MILVUS_ADDRESS: zilliz_cloud_address MILVUS_TOKEN: zilliz_cloud_token -version: '3.3' services: # Vector DB @@ -336,6 +335,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/deploy/templates/docker-compose.prod.yml b/deploy/templates/docker-compose.prod.yml index 87dc40ccf8..ba8db6f32e 100644 --- a/deploy/templates/docker-compose.prod.yml +++ b/deploy/templates/docker-compose.prod.yml @@ -43,7 +43,6 @@ x-log-config: &x-log-config x-vec-config: &x-vec-config ${{vec.config}} -version: '3.3' services: # Vector DB ${{vec.db}} @@ -335,6 +334,7 @@ ${{vec.db}} VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/document/public/deploy/docker/cn/docker-compose.milvus.yml b/document/public/deploy/docker/cn/docker-compose.milvus.yml index 781eb83779..90b429775e 100644 --- a/document/public/deploy/docker/cn/docker-compose.milvus.yml +++ b/document/public/deploy/docker/cn/docker-compose.milvus.yml @@ -45,7 +45,6 @@ x-vec-config: &x-vec-config MILVUS_TOKEN: none -version: '3.3' services: # Vector DB milvus-minio: @@ -394,6 +393,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml index 44602a03d0..1f70321f75 100644 --- a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/mysql -version: '3.3' services: # Vector DB vectorDB: @@ -371,6 +370,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/document/public/deploy/docker/cn/docker-compose.pg.yml b/document/public/deploy/docker/cn/docker-compose.pg.yml index 299dae7d99..895b779772 100644 --- a/document/public/deploy/docker/cn/docker-compose.pg.yml +++ b/document/public/deploy/docker/cn/docker-compose.pg.yml @@ -43,7 +43,6 @@ x-log-config: &x-log-config x-vec-config: &x-vec-config PG_URL: postgresql://username:password@pg:5432/postgres -version: '3.3' services: # Vector DB vectorDB: @@ -352,6 +351,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/document/public/deploy/docker/cn/docker-compose.seekdb.yml b/document/public/deploy/docker/cn/docker-compose.seekdb.yml index 32cc7d30b7..e0c5437fa4 100644 --- a/document/public/deploy/docker/cn/docker-compose.seekdb.yml +++ b/document/public/deploy/docker/cn/docker-compose.seekdb.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config SEEKDB_URL: mysql://root:seekdbpassword@seekdb:2881/mysql -version: '3.3' services: # Vector DB vectorDB: @@ -358,6 +357,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/document/public/deploy/docker/cn/docker-compose.zilliz.yml b/document/public/deploy/docker/cn/docker-compose.zilliz.yml index 203e5b174c..f99bc7a930 100644 --- a/document/public/deploy/docker/cn/docker-compose.zilliz.yml +++ b/document/public/deploy/docker/cn/docker-compose.zilliz.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config MILVUS_ADDRESS: zilliz_cloud_address MILVUS_TOKEN: zilliz_cloud_token -version: '3.3' services: # Vector DB @@ -336,6 +335,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/document/public/deploy/docker/global/docker-compose.milvus.yml b/document/public/deploy/docker/global/docker-compose.milvus.yml index 11d82aa52f..cd9d18167e 100644 --- a/document/public/deploy/docker/global/docker-compose.milvus.yml +++ b/document/public/deploy/docker/global/docker-compose.milvus.yml @@ -45,7 +45,6 @@ x-vec-config: &x-vec-config MILVUS_TOKEN: none -version: '3.3' services: # Vector DB milvus-minio: @@ -394,6 +393,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/document/public/deploy/docker/global/docker-compose.oceanbase.yml b/document/public/deploy/docker/global/docker-compose.oceanbase.yml index 9ed38e315f..d0b65f3991 100644 --- a/document/public/deploy/docker/global/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/global/docker-compose.oceanbase.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@ob:2881/mysql -version: '3.3' services: # Vector DB vectorDB: @@ -371,6 +370,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/document/public/deploy/docker/global/docker-compose.pg.yml b/document/public/deploy/docker/global/docker-compose.pg.yml index 130a3b7b62..d59b0e099d 100644 --- a/document/public/deploy/docker/global/docker-compose.pg.yml +++ b/document/public/deploy/docker/global/docker-compose.pg.yml @@ -43,7 +43,6 @@ x-log-config: &x-log-config x-vec-config: &x-vec-config PG_URL: postgresql://username:password@pg:5432/postgres -version: '3.3' services: # Vector DB vectorDB: @@ -352,6 +351,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/document/public/deploy/docker/global/docker-compose.seekdb.yml b/document/public/deploy/docker/global/docker-compose.seekdb.yml index 1743fa9339..cc4c00c85e 100644 --- a/document/public/deploy/docker/global/docker-compose.seekdb.yml +++ b/document/public/deploy/docker/global/docker-compose.seekdb.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config SEEKDB_URL: mysql://root:seekdbpassword@seekdb:2881/mysql -version: '3.3' services: # Vector DB vectorDB: @@ -358,6 +357,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/document/public/deploy/docker/global/docker-compose.ziliiz.yml b/document/public/deploy/docker/global/docker-compose.ziliiz.yml index c30a5075ed..cee3a9fd49 100644 --- a/document/public/deploy/docker/global/docker-compose.ziliiz.yml +++ b/document/public/deploy/docker/global/docker-compose.ziliiz.yml @@ -44,7 +44,6 @@ x-vec-config: &x-vec-config MILVUS_ADDRESS: zilliz_cloud_address MILVUS_TOKEN: zilliz_cloud_token -version: '3.3' services: # Vector DB @@ -336,6 +335,7 @@ services: VM_AUTH_TOKEN: *x-volume-manager-auth-token # 对应 AGENT_SANDBOX_VOLUME_MANAGER_TOKEN VM_VOLUME_NAME_PREFIX: fastgpt-session # volume 名称前缀 VM_LOG_LEVEL: info + VM_DOCKER_API_VERSION: v1.44 healthcheck: test: [ diff --git a/projects/volume-manager/.env.template b/projects/volume-manager/.env.template index 6924bef7a6..364fc53c9b 100644 --- a/projects/volume-manager/.env.template +++ b/projects/volume-manager/.env.template @@ -10,7 +10,7 @@ VM_RUNTIME=docker # Docker socket 路径(仅 docker 模式) VM_DOCKER_SOCKET=/var/run/docker.sock -VM_DOCKER_API_VERSION=1.44 +VM_DOCKER_API_VERSION=v1.44 # k8s 命名空间(仅 kubernetes 模式) VM_K8S_NAMESPACE=opensandbox diff --git a/projects/volume-manager/src/drivers/DockerVolumeDriver.ts b/projects/volume-manager/src/drivers/DockerVolumeDriver.ts index 0bdae32c70..91f764ca95 100644 --- a/projects/volume-manager/src/drivers/DockerVolumeDriver.ts +++ b/projects/volume-manager/src/drivers/DockerVolumeDriver.ts @@ -14,7 +14,7 @@ export class DockerVolumeDriver implements IVolumeDriver { private dockerFetch(path: string, init?: RequestInit): Promise { // Bun supports unix socket via the `unix` fetch option - return fetch(`http://localhost${env.VM_DOCKER_API_VERSION}${path}`, { + return fetch(`http://localhost/${env.VM_DOCKER_API_VERSION}${path}`, { ...init, // @ts-ignore - Bun-specific option unix: this.socketPath diff --git a/projects/volume-manager/src/env.ts b/projects/volume-manager/src/env.ts index 71c4dc3e96..01ab93eeb3 100644 --- a/projects/volume-manager/src/env.ts +++ b/projects/volume-manager/src/env.ts @@ -5,7 +5,7 @@ const schema = z.object({ VM_AUTH_TOKEN: z.string().min(1), VM_RUNTIME: z.enum(['docker', 'kubernetes']).default('kubernetes'), VM_DOCKER_SOCKET: z.string().default('/var/run/docker.sock'), - VM_DOCKER_API_VERSION: z.string().default('1.44'), + VM_DOCKER_API_VERSION: z.string().default('v1.44'), VM_K8S_NAMESPACE: z.string().default('opensandbox'), VM_K8S_PVC_STORAGE_CLASS: z.string().default('standard'), VM_K8S_PVC_STORAGE_SIZE: z.string().default('1Gi'),