From b9222cf33da2fa535518c18df8a6aaa8700ed36f Mon Sep 17 00:00:00 2001 From: katelya Date: Thu, 4 Sep 2025 13:28:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AF=B9linux/arm/v7?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9A=84=E6=94=AF=E6=8C=81=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96Docker=E6=9E=84=E5=BB=BA=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-build.yml | 6 +++--- .github/workflows/docker-image.yml | 1 + Dockerfile | 6 ++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index beeff91..8db9705 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -36,7 +36,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 push: false tags: | katelyatv:latest @@ -58,7 +58,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 push: true tags: | ghcr.io/${{ github.repository_owner }}/katelyatv:latest @@ -75,7 +75,7 @@ jobs: - name: Test Summary run: | echo "✅ Docker build completed successfully!" - echo "📦 Multi-platform support: linux/amd64, linux/arm64" + echo "📦 Multi-platform support: linux/amd64, linux/arm64, linux/arm/v7" echo "🔄 Cache optimization enabled" if [ "${{ github.event_name }}" != "pull_request" ] && [ "${{ github.ref }}" == "refs/heads/main" ]; then echo "🚀 Images pushed to GitHub Container Registry" diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 3760536..8ffc2fa 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -30,6 +30,7 @@ jobs: platform: - linux/amd64 - linux/arm64 + - linux/arm/v7 steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/Dockerfile b/Dockerfile index 5a6294d..4a2199c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,9 @@ WORKDIR /app # 仅复制依赖清单,提高构建缓存利用率 COPY package.json pnpm-lock.yaml ./ +# 针对ARM架构优化:设置更大的内存限制和超时时间 +ENV NODE_OPTIONS="--max-old-space-size=4096" + # 安装所有依赖(含 devDependencies,后续会裁剪) RUN pnpm install --frozen-lockfile @@ -17,6 +20,9 @@ FROM --platform=$BUILDPLATFORM node:20-alpine AS builder RUN corepack enable && corepack prepare pnpm@latest --activate WORKDIR /app +# 针对ARM架构优化:设置更大的内存限制 +ENV NODE_OPTIONS="--max-old-space-size=4096" + # 复制依赖 COPY --from=deps /app/node_modules ./node_modules # 复制全部源代码