From 69c037bf51e73d2d7aebbe998886f9a65b323fe9 Mon Sep 17 00:00:00 2001 From: shanshanzhong Date: Sun, 4 Jan 2026 01:15:43 -0800 Subject: [PATCH] =?UTF-8?q?ci(docker):=20=E4=BC=98=E5=8C=96=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=AE=89=E8=A3=85=E6=B5=81=E7=A8=8B=E5=B9=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20musl=20=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加 DEBIAN_FRONTEND=noninteractive 以避免 apt 安装交互问题 预装编译依赖确保 nvm 安装成功 添加 musl libc 检测以支持不同环境的节点安装 优化节点目录查找逻辑 --- .gitea/workflows/docker.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index c7e8de9..be36726 100644 --- a/.gitea/workflows/docker.yml +++ b/.gitea/workflows/docker.yml @@ -44,7 +44,7 @@ jobs: PKGS="$*" if command -v apt-get >/dev/null 2>&1; then apt-get update -y - apt-get install -y $PKGS + DEBIAN_FRONTEND=noninteractive apt-get install -y $PKGS elif command -v yum >/dev/null 2>&1; then yum install -y $PKGS elif command -v dnf >/dev/null 2>&1; then @@ -60,6 +60,8 @@ jobs: if ! command -v curl >/dev/null 2>&1; then install_pkgs curl ca-certificates; fi if ! command -v tar >/dev/null 2>&1; then install_pkgs tar; fi if ! command -v xz >/dev/null 2>&1 && ! command -v unxz >/dev/null 2>&1; then install_pkgs xz-utils || install_pkgs xz; fi + # 预装编译依赖,避免 nvm 源码安装失败 + install_pkgs python3 make gcc g++ || true if ! command -v node >/dev/null 2>&1; then NODE_VER="v20.19.6" ARCH="$(uname -m)" @@ -69,16 +71,25 @@ jobs: arm64) NODE_ARCH="linux-arm64" ;; *) echo "Unsupported arch: $ARCH"; exit 1 ;; esac - NODE_TARBALL="node-${NODE_VER}-${NODE_ARCH}.tar.xz" + # 检测 libc 类型,musl 用 musl 包 + LIBC_TYPE="glibc" + if command -v ldd >/dev/null 2>&1; then + if ldd --version 2>&1 | grep -qi musl; then LIBC_TYPE="musl"; fi + fi + if [ "$LIBC_TYPE" = "musl" ] && [ "$NODE_ARCH" = "linux-x64" ]; then + NODE_TARBALL="node-${NODE_VER}-linux-x64-musl.tar.xz" + else + NODE_TARBALL="node-${NODE_VER}-${NODE_ARCH}.tar.xz" + fi URL="https://nodejs.org/dist/${NODE_VER}/${NODE_TARBALL}" curl -fsSL "$URL" -o "/tmp/${NODE_TARBALL}" mkdir -p "$HOME/node" tar -xJf "/tmp/${NODE_TARBALL}" -C "$HOME/node" - NODE_DIR="$HOME/node/node-${NODE_VER}-${NODE_ARCH}" + # 解析实际解压目录名 + NODE_DIR="$(find "$HOME/node" -maxdepth 1 -type d -name "node-${NODE_VER}-*" | head -n1)" export PATH="$NODE_DIR/bin:$PATH" fi if ! node -v >/dev/null 2>&1; then - install_pkgs python3 make gcc g++ build-essential || true export NVM_DIR="$HOME/.nvm" if [ ! -d "$NVM_DIR" ]; then curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash