From 185758b6383e945d56d92346277e3707959aea9e Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Mon, 25 Mar 2024 00:14:44 +0800
Subject: [PATCH] use current platform to build frontend assets

---
 .gitea/workflows/docker-release.yml  | 1 +
 .gitea/workflows/docker-snapshot.yml | 2 +-
 Dockerfile                           | 2 +-
 package.json                         | 3 ---
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/docker-release.yml b/.gitea/workflows/docker-release.yml
index ba36c1bf..f6898fc9 100644
--- a/.gitea/workflows/docker-release.yml
+++ b/.gitea/workflows/docker-release.yml
@@ -31,6 +31,7 @@ jobs:
 
       - name: Set up the environment
         run: |
+          sed -r -i 's#FROM( --.*)? (.*:.*)?#FROM\1 ${{ secrets.DOCKER_REPO }}/mirrors/\2#g' Dockerfile
           cat >> docker/custom-backend-pre-setup.sh <<EOF
           #!/bin/sh
           ${{ vars.CUSTOM_BACKEND_PRE_SETUP }}
diff --git a/.gitea/workflows/docker-snapshot.yml b/.gitea/workflows/docker-snapshot.yml
index e3bc2cd6..ec9b2349 100644
--- a/.gitea/workflows/docker-snapshot.yml
+++ b/.gitea/workflows/docker-snapshot.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Set up the environment
         run: |
-          sed -i 's#FROM #FROM ${{ secrets.DOCKER_REPO }}/mirrors/#g' Dockerfile
+          sed -r -i 's#FROM( --.*)? (.*:.*)?#FROM\1 ${{ secrets.DOCKER_REPO }}/mirrors/\2#g' Dockerfile
           cat >> docker/custom-backend-pre-setup.sh <<EOF
           #!/bin/sh
           ${{ vars.CUSTOM_BACKEND_PRE_SETUP }}
diff --git a/Dockerfile b/Dockerfile
index 2134cc4a..8cd1fe25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN apk add git gcc g++ libc-dev
 RUN ./build.sh backend
 
 # Build frontend files
-FROM node:18.19.1-alpine3.19 AS fe-builder
+FROM --platform=$BUILDPLATFORM node:18.19.1-alpine3.19 AS fe-builder
 ARG RELEASE_BUILD
 ENV RELEASE_BUILD=$RELEASE_BUILD
 WORKDIR /go/src/github.com/mayswind/ezbookkeeping
diff --git a/package.json b/package.json
index 17a4d69b..a9ceedaf 100644
--- a/package.json
+++ b/package.json
@@ -59,9 +59,6 @@
     "vite-plugin-pwa": "^0.19.2",
     "vite-plugin-vuetify": "^2.0.2"
   },
-  "overrides": {
-    "rollup": "npm:@rollup/wasm-node"
-  },
   "browserslist": [
     "> 1%",
     "last 2 versions",