diff --git a/deploy.sh b/deploy.sh index cf56ac4..277518b 100755 --- a/deploy.sh +++ b/deploy.sh @@ -39,12 +39,15 @@ check_dependencies() { exit 1 fi - if ! command -v docker-compose &> /dev/null; then - log_error "Docker Compose 未安装或不在PATH中" + # 检查Docker Compose plugin + if ! docker compose version &> /dev/null; then + log_error "Docker Compose plugin 未安装" exit 1 fi log_info "依赖检查完成" + log_info "Docker版本: $(docker --version)" + log_info "Docker Compose版本: $(docker compose version)" } # 检查proxy网络是否存在 @@ -123,13 +126,13 @@ build_and_start() { cd "${FRONTEND_DIR}" # 停止现有服务 - docker-compose down || true + docker compose down || true # 构建镜像 - docker-compose build --no-cache + docker compose build --no-cache # 启动服务 - docker-compose up -d + docker compose up -d log_info "前端服务启动完成" } @@ -142,11 +145,11 @@ verify_deployment() { sleep 10 # 检查容器状态 - if docker-compose ps | grep -q "Up"; then + if docker compose ps | grep -q "Up"; then log_info "前端服务运行正常" else log_error "前端服务启动失败" - docker-compose logs + docker compose logs exit 1 fi @@ -186,9 +189,9 @@ show_info() { echo " 备份位置: ${BACKUP_DIR}" echo "" echo "常用命令:" - echo " 查看日志: cd ${FRONTEND_DIR} && docker-compose logs -f" - echo " 重启服务: cd ${FRONTEND_DIR} && docker-compose restart" - echo " 停止服务: cd ${FRONTEND_DIR} && docker-compose down" + echo " 查看日志: cd ${FRONTEND_DIR} && docker compose logs -f" + echo " 重启服务: cd ${FRONTEND_DIR} && docker compose restart" + echo " 停止服务: cd ${FRONTEND_DIR} && docker compose down" echo "" }