diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml index b4ca664..16d7fc5 100644 --- a/.github/workflows/Deploy.yml +++ b/.github/workflows/Deploy.yml @@ -41,6 +41,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . + platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index 6cc4b98..336b824 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,4 @@ -# 添加多架构支持 -FROM --platform=linux/amd64 node:21-alpine AS base-amd64 -FROM --platform=linux/arm64 node:21-alpine AS base-arm64 - -# 选择基础镜像 -ARG TARGETARCH -FROM base-${TARGETARCH} AS base +FROM node:21-alpine AS base FROM base AS deps RUN apk add --no-cache libc6-compat diff --git a/bun.lockb b/bun.lockb index 3f35af2..cec27df 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/lib/serverFetch.tsx b/lib/serverFetch.tsx index 6d84ab0..020f162 100644 --- a/lib/serverFetch.tsx +++ b/lib/serverFetch.tsx @@ -6,7 +6,6 @@ import { error } from "console"; import { unstable_noStore as noStore } from "next/cache"; import getEnv from "./env-entry"; - export async function GetNezhaData() { noStore();