From a65b3b87be085998e9ce7adf37295d9d77877b34 Mon Sep 17 00:00:00 2001 From: Wenjie Zhang Date: Tue, 24 Jun 2025 00:16:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20docker-compose=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BC=98=E5=8C=96=20GPU=20=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=92=8C=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 GPU 设备 ID 从 '0' 修改为 '2'。 - 更新 NEO4J_URI、MILVUS_URI、MINERU_OCR_URI 和 PADDLEX_URI 的环境变量设置,支持默认值。 - 新增 MINIO_URI 环境变量,配置 MinIO 服务。 - 添加 MinIO 服务的健康检查和端口映射,确保服务可用性。 --- docker-compose.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6879f7e0..e5a3da45 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,12 +28,13 @@ services: extra_hosts: - "host.docker.internal:host-gateway" environment: - - NEO4J_URI=bolt://graph:7687 + - NEO4J_URI=${NEO4J_URI:-bolt://graph:7687} - NEO4J_USERNAME=${NEO4J_USERNAME:-neo4j} - NEO4J_PASSWORD=${NEO4J_PASSWORD:-0123456789} - - MILVUS_URI=http://milvus:19530 - - MINERU_OCR_URI=http://mineru:30000 - - PADDLEX_URI=http://paddlex:8080 + - MILVUS_URI=${MILVUS_URI:-http://milvus:19530} + - MINERU_OCR_URI=${MINERU_OCR_URI:-http://mineru:30000} + - PADDLEX_URI=${PADDLEX_URI:-http://paddlex:8080} + - MINIO_URI=${MINIO_URI:-http://milvus-minio:9000} - MODEL_DIR=/models - RUNNING_IN_DOCKER=true command: uv run uvicorn server.main:app --host 0.0.0.0 --port 5050 --reload @@ -41,6 +42,8 @@ services: depends_on: milvus: condition: service_healthy + minio: + condition: service_healthy web: build: @@ -117,13 +120,17 @@ services: MINIO_SECRET_KEY: ${MINIO_SECRET_KEY:-minioadmin} volumes: - ./docker/volumes/milvus/minio:/minio_data - command: minio server /minio_data + - ./docker/volumes/milvus/minio_config:/root/.minio + command: minio server /minio_data --address 0.0.0.0:9000 --console-address 0.0.0.0:9001 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] interval: 60s timeout: 30s retries: 5 start_period: 30s + ports: + - "9000:9000" + - "9001:9001" networks: - app-network restart: unless-stopped