mirror of
https://github.com/yyhuni/xingrin.git
synced 2026-02-01 04:03:23 +08:00
- Add multi-engine support to Scan model with engine_ids and engine_names fields - Implement config_merger utility for merging multiple engine configurations - Add merged_configuration property to Scan model for unified config access - Update scan creation and scheduling services to handle multiple engines - Add pg_trgm GIN indexes to asset and snapshot models for fuzzy search on url, title, and name fields - Update scan views and serializers to support multi-engine selection and display - Enhance frontend components for multi-engine scan initiation and scheduling - Update test data generation script for multi-engine scan scenarios - Add internationalization strings for multi-engine UI elements - Refactor scan flow to use merged configuration instead of single engine config - Update Docker compose files with latest configuration
121 lines
2.9 KiB
YAML
121 lines
2.9 KiB
YAML
services:
|
||
# PostgreSQL(可选,使用远程数据库时不启动)
|
||
# 本地模式: docker compose --profile local-db up -d
|
||
# 远程模式: docker compose up -d(需配置 DB_HOST 为远程地址)
|
||
postgres:
|
||
profiles: ["local-db"]
|
||
image: postgres:15
|
||
restart: always
|
||
environment:
|
||
POSTGRES_DB: ${DB_NAME}
|
||
POSTGRES_USER: ${DB_USER}
|
||
POSTGRES_PASSWORD: ${DB_PASSWORD}
|
||
volumes:
|
||
- postgres_data:/var/lib/postgresql/data
|
||
- ./postgres/init-user-db.sh:/docker-entrypoint-initdb.d/init-user-db.sh
|
||
ports:
|
||
- "${DB_PORT}:5432"
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "pg_isready -U ${DB_USER}"]
|
||
interval: 5s
|
||
timeout: 5s
|
||
retries: 5
|
||
|
||
redis:
|
||
image: redis:7-alpine
|
||
restart: always
|
||
healthcheck:
|
||
test: ["CMD", "redis-cli", "ping"]
|
||
interval: 5s
|
||
timeout: 5s
|
||
retries: 5
|
||
|
||
server:
|
||
build:
|
||
context: ..
|
||
dockerfile: docker/server/Dockerfile
|
||
restart: always
|
||
env_file:
|
||
- .env
|
||
ports:
|
||
- "8888:8888"
|
||
depends_on:
|
||
redis:
|
||
condition: service_healthy
|
||
volumes:
|
||
# 统一挂载数据目录
|
||
- /opt/xingrin:/opt/xingrin
|
||
- /var/run/docker.sock:/var/run/docker.sock
|
||
healthcheck:
|
||
# 使用专门的健康检查端点(无需认证)
|
||
test: ["CMD", "curl", "-f", "http://localhost:8888/api/health/"]
|
||
interval: 30s
|
||
timeout: 10s
|
||
retries: 3
|
||
start_period: 60s
|
||
|
||
# Agent:心跳上报 + 负载监控 + 版本检查
|
||
agent:
|
||
build:
|
||
context: ..
|
||
dockerfile: docker/agent/Dockerfile
|
||
args:
|
||
IMAGE_TAG: ${IMAGE_TAG:-dev}
|
||
restart: always
|
||
environment:
|
||
- SERVER_URL=http://server:8888
|
||
- WORKER_NAME=Local-Worker
|
||
- IS_LOCAL=true
|
||
- IMAGE_TAG=${IMAGE_TAG:-dev}
|
||
- WORKER_API_KEY=${WORKER_API_KEY}
|
||
depends_on:
|
||
server:
|
||
condition: service_healthy
|
||
volumes:
|
||
- /proc:/host/proc:ro
|
||
|
||
frontend:
|
||
build:
|
||
context: ..
|
||
dockerfile: docker/frontend/Dockerfile
|
||
args:
|
||
IMAGE_TAG: ${IMAGE_TAG:-dev}
|
||
restart: always
|
||
depends_on:
|
||
server:
|
||
condition: service_healthy
|
||
|
||
nginx:
|
||
build:
|
||
context: ..
|
||
dockerfile: docker/nginx/Dockerfile
|
||
restart: always
|
||
depends_on:
|
||
server:
|
||
condition: service_healthy
|
||
frontend:
|
||
condition: service_started
|
||
ports:
|
||
- "8083:8083"
|
||
volumes:
|
||
# SSL 证书挂载(方便更新)
|
||
- ./nginx/ssl:/etc/nginx/ssl:ro
|
||
|
||
# Worker:扫描任务执行容器(开发模式下构建)
|
||
worker:
|
||
build:
|
||
context: ..
|
||
dockerfile: docker/worker/Dockerfile
|
||
image: docker-worker:${IMAGE_TAG:-latest}-dev
|
||
restart: "no"
|
||
volumes:
|
||
- /opt/xingrin:/opt/xingrin
|
||
command: echo "Worker image built for development"
|
||
|
||
volumes:
|
||
postgres_data:
|
||
|
||
networks:
|
||
default:
|
||
name: xingrin_network # 固定网络名,不随目录名变化
|