diff --git a/archive-manager.sh b/archive-manager.sh index 2676da0..1d81e09 100755 --- a/archive-manager.sh +++ b/archive-manager.sh @@ -168,7 +168,8 @@ check_environment() { # 检查容器 local mysql_container=$(docker network inspect proxy --format '{{range .Containers}}{{.Name}} {{end}}' 2>/dev/null | tr ' ' '\n' | grep -i mysql | head -1 || true) local redis_container=$(docker network inspect proxy --format '{{range .Containers}}{{.Name}} {{end}}' 2>/dev/null | tr ' ' '\n' | grep -i redis | head -1 || true) - local es_container=$(docker network inspect proxy --format '{{range .Containers}}{{.Name}} {{end}}' 2>/dev/null | tr ' ' '\n' | grep -i elasticsearch | head -1 || true) + local es_container=$(docker network inspect proxy --format '{{range .Containers}}{{.Name}} {{end}}' 2>/dev/null | tr ' ' ' +' | grep -w "es" | head -1 || true) if [ -z "$mysql_container" ]; then log_error "proxy网络中未找到MySQL容器" @@ -229,8 +230,10 @@ REDIS_HOST=redis REDIS_PORT=6379 REDIS_PASSWORD=Abc123456 -# Elasticsearch配置 -ELASTICSEARCH_URIS=http://elasticsearch:9200 +# Elasticsearch配置 - 使用已有的 "es" 容器 +ELASTICSEARCH_HOST=es +ELASTICSEARCH_PORT=9200 +ELASTICSEARCH_SCHEME=http # OCR配置 TESS_PATH=/usr/bin/tesseract diff --git a/docker-compose.simple.yml b/docker-compose.simple.yml index ccea1a7..709659d 100644 --- a/docker-compose.simple.yml +++ b/docker-compose.simple.yml @@ -28,6 +28,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 # 其他配置 @@ -44,22 +48,8 @@ services: retries: 3 start_period: 60s -# 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: - - proxy - restart: unless-stopped +# Elasticsearch - 使用已有的 "es" 容器 + # 注意:确保已有的 "es" 容器已连接到 proxy 网络 networks: proxy: