From 3da858b98bd1ef5a52008fd603a4e65172e6e088 Mon Sep 17 00:00:00 2001
From: winkidney <winkidney@gmail.com>
Date: Mon, 30 Sep 2024 20:30:13 +0800
Subject: [PATCH] fix: try to fix dockerfile

---
 Dockerfile           |  4 ++--
 Dockerfile.autobuild | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0e31934..e912e98 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,8 @@ COPY . /app
 
 # config nodejs
 RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
-RUN bash n 14
-RUN npm -g install yarn
+RUN bash n 18
+RUN npm -g install pnpm
 
 WORKDIR /app
 RUN pip install poetry
diff --git a/Dockerfile.autobuild b/Dockerfile.autobuild
index f607b11..c9a757b 100644
--- a/Dockerfile.autobuild
+++ b/Dockerfile.autobuild
@@ -10,14 +10,14 @@
 # Require: Docker (http://www.docker.io/)
 # -----------------------------------------------------------------------------
 
-# Build static yarn file
-FROM node:14-buster as yarn-build
+# Build static pnpm file
+FROM node:18-bookworm as pnpm-build
 
 WORKDIR pinry-spa
-COPY pinry-spa/package.json pinry-spa/yarn.lock ./
-RUN yarn install
+COPY pinry-spa/package.json pinry-spa/pnpm-lock.yaml ./
+RUN pnpm install
 COPY pinry-spa .
-RUN yarn build
+RUN pnpm build
 
 
 # Required for other database options
@@ -61,7 +61,7 @@ RUN pip install "rcssmin==1.0.6" --install-option="--without-c-extensions" \
     && pip install -r requirements.txt
 
 # Copy from previous stages
-COPY --from=yarn-build pinry-spa/dist /pinry/pinry-spa/dist
+COPY --from=pnpm-build pinry-spa/dist /pinry/pinry-spa/dist
 COPY --from=base /root/.local /root/.local
 ENV PATH=/root/.local/bin:$PATH