Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 6c71bdfe by Archer Committed by GitHub
Options

dockerfile (#6692)

parent 33a79639
Showing with 24 additions and 24 deletions
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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:
[
......
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
......
projects/volume-manager/src/drivers/DockerVolumeDriver.ts
......@@ -14,7 +14,7 @@ export class DockerVolumeDriver implements IVolumeDriver {
private dockerFetch(path: string, init?: RequestInit): Promise<Response> {
// 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
......
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'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment