test

docker-compose.yml

@@ -30,6 +30,10 @@ services:
       - REDIS_HOST=redis
       - REDIS_PORT=6379
       - REDIS_PASSWORD=Abc123456
+      # Elasticsearch配置 - 使用已有的 "es" 容器
+      - ELASTICSEARCH_HOST=es
+      - ELASTICSEARCH_PORT=9200
+      - ELASTICSEARCH_SCHEME=http
       # OCR配置
       - TESS_PATH=/usr/bin/tesseract
       # 其他配置
@@ -40,7 +44,7 @@ services:
       - database
       - redis
     networks:
-      - archive-network
+      - proxy
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9081/point-strategy/actuator/health"]
@@ -63,7 +67,7 @@ services:
       - ./data/database:/var/lib/kingbase/data
       - ./init-scripts:/docker-entrypoint-initdb.d
     networks:
-      - archive-network
+      - proxy
     restart: unless-stopped
 
   # Redis缓存
@@ -76,25 +80,11 @@ services:
     volumes:
       - ./data/redis:/data
     networks:
-      - archive-network
+      - proxy
     restart: unless-stopped
 
-  # Elasticsearch（可选，用于全文检索）
-  elasticsearch:
-    image: elasticsearch:7.17.0
-    container_name: digital-archive-elasticsearch
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-    environment:
-      - discovery.type=single-node
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-      - xpack.security.enabled=false
-    volumes:
-      - ./data/elasticsearch:/usr/share/elasticsearch/data
-    networks:
-      - archive-network
-    restart: unless-stopped
+  # Elasticsearch - 使用已有的 "es" 容器
+  # 注意：确保已有的 "es" 容器已连接到 proxy 网络
 
   # Nginx反向代理（可选）
   nginx:
@@ -109,12 +99,12 @@ services:
     depends_on:
       - app
     networks:
-      - archive-network
+      - proxy
     restart: unless-stopped
 
 networks:
-  archive-network:
-    driver: bridge
+  proxy:
+    external: true
 
 volumes:
   upload-data: