From 2f0ae76273441647da2f23886b4b397a31f9f2ce Mon Sep 17 00:00:00 2001 From: wangbo Date: Thu, 9 Apr 2026 21:26:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(install):=20=E6=94=AF=E6=8C=81=20macOS=20?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9A=84=E4=B8=80=E9=94=AE=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新 README.md 标题为 Linux/Mac 兼容 - 添加 macOS 系统检测逻辑,使用 uname 命令识别 Darwin 内核 - 实现 macOS Docker Desktop 的自动安装功能,通过 Homebrew 安装 - 添加 Docker Desktop 启动等待机制,最多等待 120 秒 - 提供 macOS 用户安装选项,支持自动或手动安装模式 - 跳过 macOS 上的 systemd 服务管理命令执行 --- README.md | 2 +- start.sh | 83 +++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 75 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index f689f9e..5f1f3b5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## 一键部署 -### Linux +### Linux/Mac ```bash git clone https://git.51easyai.com/wangbo/easyai.git && cd easyai && chmod +x start.sh && ./start.sh diff --git a/start.sh b/start.sh index 65521b1..eb45963 100755 --- a/start.sh +++ b/start.sh @@ -216,20 +216,29 @@ install_docker() { echo " Docker 安装与检查" echo "================================" - if [ -f /etc/os-release ]; then + local host_os + host_os="$(uname -s 2>/dev/null || echo Unknown)" + + if [[ "$host_os" == "Darwin" ]]; then + OS_FAMILY="macOS" + OS_VERSION_ID="0" + OS_CODENAME="" + elif [ -f /etc/os-release ]; then . /etc/os-release case "${ID:-}" in ubuntu|debian) OS_FAMILY="Ubuntu" ;; centos|rhel|fedora) OS_FAMILY="CentOS" ;; *) OS_FAMILY="${ID:-Unknown}" ;; esac + OS_VERSION_ID=$(grep -oP '(?<=^VERSION_ID=")[0-9.]+' /etc/os-release 2>/dev/null | cut -d'.' -f1 || echo "0") + OS_CODENAME="" + if [[ "$OS_FAMILY" == "Ubuntu" ]]; then + OS_CODENAME=$(lsb_release -cs 2>/dev/null || (grep VERSION_CODENAME /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '"')) + fi else OS_FAMILY=$(hostnamectl 2>/dev/null | grep "Operating System" | awk '{print $3}' || echo "Unknown") - fi - OS_VERSION_ID=$(grep -oP '(?<=^VERSION_ID=")[0-9.]+' /etc/os-release 2>/dev/null | cut -d'.' -f1 || echo "0") - OS_CODENAME="" - if [[ "$OS_FAMILY" == "Ubuntu" ]]; then - OS_CODENAME=$(lsb_release -cs 2>/dev/null || (grep VERSION_CODENAME /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '"')) + OS_VERSION_ID="0" + OS_CODENAME="" fi UBUNTU_DOCKER_MIRROR_URL="https://mirrors.ustc.edu.cn/docker-ce" @@ -246,6 +255,38 @@ install_docker() { } check_network + install_docker_macos() { + if ! command -v brew &>/dev/null; then + echo "❌ 未检测到 Homebrew,无法自动安装 Docker Desktop。" + echo " 请先安装 Homebrew: https://brew.sh/" + return 1 + fi + + if brew list --cask docker &>/dev/null; then + echo "✅ Docker Desktop 已安装(Homebrew)" + else + echo "📦 正在通过 Homebrew 安装 Docker Desktop..." + brew install --cask docker + fi + + echo "🚀 正在尝试启动 Docker Desktop..." + open -a Docker || true + + echo "⏳ 等待 Docker 引擎就绪(最多 120 秒)..." + local i + for i in $(seq 1 60); do + if docker info &>/dev/null; then + echo "✅ Docker Desktop 已启动并可用" + return 0 + fi + sleep 2 + done + + echo "⚠️ Docker Desktop 已安装,但尚未就绪。" + echo " 请手动打开 Docker Desktop,待状态正常后重新运行 ./start.sh" + return 1 + } + if command -v docker &>/dev/null; then echo "✅ Docker 已安装" else @@ -265,13 +306,37 @@ install_docker() { sudo sed -i "s+https://download.docker.com+$CENTOS_DOCKER_MIRROR_URL+g" /etc/yum.repos.d/docker-ce.repo [[ "$OS_VERSION_ID" -ge "8" ]] && sudo yum module disable -y container-tools 2>/dev/null || true sudo yum install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + elif [[ "$OS_FAMILY" == "macOS" ]]; then + echo "⚠️ 检测到 macOS,未找到 Docker。" + echo "请选择安装方式:" + echo " [1] 自动安装 Docker Desktop(需要 Homebrew)" + echo " [2] 手动安装(默认)" + read -r -p "请选择 [1/2]: " mac_install_choice + case "${mac_install_choice:-2}" in + 1) + if ! install_docker_macos; then + exit 1 + fi + ;; + 2) + echo " 请手动安装 Docker Desktop: https://www.docker.com/products/docker-desktop/" + echo " 安装并启动 Docker Desktop 后,重新运行 ./start.sh" + exit 1 + ;; + *) + echo "❌ 无效选择" + exit 1 + ;; + esac else echo "❌ 不支持的操作系统: $OS_FAMILY" exit 1 fi - sudo systemctl enable docker - sudo systemctl start docker - getent group docker | grep -qw "$USER" || sudo usermod -aG docker "$USER" + if [[ "$OS_FAMILY" != "macOS" ]]; then + sudo systemctl enable docker + sudo systemctl start docker + getent group docker | grep -qw "$USER" || sudo usermod -aG docker "$USER" + fi fi if docker compose version &>/dev/null; then