From 46e61216f6d497c6cc12dfa900bb8b98ab60db03 Mon Sep 17 00:00:00 2001 From: attacker Date: Fri, 19 Jun 2026 00:41:35 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=BC=E5=AE=B9=20docker=20compose?= =?UTF-8?q?=20/=20docker-compose,=20=E7=A7=BB=E9=99=A4=20compose=20version?= =?UTF-8?q?=20=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 6 ------ run.sh | 32 +++++++++++++++++++++++++------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 17f8da4..f2d19e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: # ======================== MySQL 数据库 ======================== mysql: @@ -58,8 +56,6 @@ services: - "8080:8080" volumes: - ./backend/config.yaml:/app/config.yaml - - backend_logs:/app/logs - - backend_uploads:/app/uploads depends_on: mysql: condition: service_healthy @@ -92,8 +88,6 @@ services: volumes: mysql_data: redis_data: - backend_logs: - backend_uploads: networks: aiops-network: diff --git a/run.sh b/run.sh index 7c5ff39..07cff85 100755 --- a/run.sh +++ b/run.sh @@ -282,6 +282,17 @@ cmd_logs() { # ============================================================ # Docker Compose 部署 # ============================================================ +# 检测 Docker Compose 命令 (兼容 docker compose 插件和 docker-compose 独立二进制) +detect_compose_cmd() { + if docker compose version &>/dev/null 2>&1; then + echo "docker compose" + elif command -v docker-compose &>/dev/null; then + echo "docker-compose" + else + echo "" + fi +} + cmd_docker() { local action=${1:-help} @@ -290,14 +301,21 @@ cmd_docker() { exit 1 fi + DOCKER_COMPOSE=$(detect_compose_cmd) + if [ -z "$DOCKER_COMPOSE" ]; then + error "Docker Compose 未安装 (需要 docker compose 插件或 docker-compose)" + exit 1 + fi + info "使用: $DOCKER_COMPOSE" + case "$action" in up) banner "========== Docker Compose 启动 ==========" - docker compose up -d --build + $DOCKER_COMPOSE up -d --build echo "" info "等待服务就绪..." sleep 5 - docker compose ps + $DOCKER_COMPOSE ps echo "" info "前端地址: http://localhost:80" info "后端地址: http://localhost:8080" @@ -305,25 +323,25 @@ cmd_docker() { ;; down) info "停止 Docker Compose..." - docker compose down + $DOCKER_COMPOSE down success "容器已停止" ;; build) info "构建 Docker 镜像..." - docker compose build + $DOCKER_COMPOSE build success "镜像构建完成" ;; restart) info "重启 Docker Compose..." - docker compose restart + $DOCKER_COMPOSE restart success "容器已重启" ;; logs) info "Docker 实时日志 (Ctrl+C 退出):" - docker compose logs -f + $DOCKER_COMPOSE logs -f ;; ps|status) - docker compose ps + $DOCKER_COMPOSE ps ;; help|--help|-h) echo "Docker Compose 部署命令:"