feat: 兼容 docker compose / docker-compose, 移除 compose version 警告
This commit is contained in:
1 parent
4e3f8cb306
commit
46e61216f6
2 files changed
+25
-13
No files matched your search
@@ -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 部署命令:"
|
||||
|
||||
Reference in new issue
Block a user