From 99ec75b3eb64019da124bd90cbf5748403c05b7e Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Mon, 23 Sep 2024 13:13:14 +0800 Subject: [PATCH] fix: add platforms --- .github/workflows/Deploy.yml | 1 + Dockerfile | 8 +------- bun.lockb | Bin 419594 -> 419594 bytes lib/serverFetch.tsx | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) 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 3f35af25937000d938a16787a41ebc3c1b7c59a9..cec27df41afa41b33de8e9426bdf0efd1e9a251b 100755 GIT binary patch delta 62 zcmeA=C)ssQvY~~sg{g&k3yUTfqw#btE*2w3i|MgkEZ&TU(^qn_$S@jjKgPw<$;4>f R9>B{2#H`x`c-eME0st-N5VHUP delta 62 zcmeA=C)ssQvY~~sg{g&k3yUTfqtSFNE*2w3^Xai%EZ&R;(^qn_$S@jhKgPw<$;4>X R9>B{2#H`x`c-eME0st*i5Uv0K 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();