digital-archive/server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
aipper
2025-11-01 16:23:50 +08:00
parent 1117815a9a
commit e4cb0bb76e
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
archive-manager.sh
View File

@@ -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 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 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 if [ -z "$mysql_container" ]; then
log_error "proxy网络中未找到MySQL容器" log_error "proxy网络中未找到MySQL容器"
@@ -229,8 +230,10 @@ REDIS_HOST=redis
REDIS_PORT=6379 REDIS_PORT=6379
REDIS_PASSWORD=Abc123456 REDIS_PASSWORD=Abc123456
# Elasticsearch配置 # Elasticsearch配置 - 使用已有的 "es" 容器
ELASTICSEARCH_URIS=http://elasticsearch:9200 ELASTICSEARCH_HOST=es
ELASTICSEARCH_PORT=9200
ELASTICSEARCH_SCHEME=http
# OCR配置 # OCR配置
TESS_PATH=/usr/bin/tesseract TESS_PATH=/usr/bin/tesseract

22
docker-compose.simple.yml
View File

@@ -28,6 +28,10 @@ services:
- REDIS_HOST=redis - REDIS_HOST=redis
- REDIS_PORT=6379 - REDIS_PORT=6379
- REDIS_PASSWORD=Abc123456 - REDIS_PASSWORD=Abc123456
# Elasticsearch配置 - 使用已有的 "es" 容器
- ELASTICSEARCH_HOST=es
- ELASTICSEARCH_PORT=9200
- ELASTICSEARCH_SCHEME=http
# OCR配置 # OCR配置
- TESS_PATH=/usr/bin/tesseract - TESS_PATH=/usr/bin/tesseract
# 其他配置 # 其他配置
@@ -44,22 +48,8 @@ services:
retries: 3 retries: 3
start_period: 60s start_period: 60s
# Elasticsearch服务 # Elasticsearch - 使用已有的 "es" 容器
elasticsearch: # 注意：确保已有的 "es" 容器已连接到 proxy 网络
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
networks: networks:
proxy: proxy: