From 6e2d7e9792cbf12cda849d52c34a2caddd5717bc Mon Sep 17 00:00:00 2001
From: CyberRex <hspwinx86@gmail.com>
Date: Mon, 16 Jan 2023 06:08:42 +0900
Subject: Use pnpm for package manager (#9531)

* Use pnpm for package manager

* Fix

* Change github workflow

* use pnpm in workflow

* fix

* Fix test (e2e/jest)

* Update Dockerfile for pnpm

* Exclude node_modules from file search on VSCode

* Update pnpm-lock.yaml

* Update pnpm-lock.yaml

* Move typescript from devDependencies to dependencies

* Fix Dockerfile

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 48192a8bab..175be0fdb4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,27 +2,27 @@ ARG NODE_VERSION=18.13.0-bullseye
 
 FROM node:${NODE_VERSION} AS builder
 
-ARG NODE_ENV=production
-
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
 	build-essential
 
 WORKDIR /misskey
 
-COPY [".yarnrc.yml", "package.json", "yarn.lock", "./"]
-COPY [".yarn", "./.yarn"]
+COPY ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
 COPY ["scripts", "./scripts"]
 COPY ["packages/backend/package.json", "./packages/backend/"]
 COPY ["packages/frontend/package.json", "./packages/frontend/"]
 COPY ["packages/sw/package.json", "./packages/sw/"]
 
-RUN yarn install --immutable
+RUN npm i -g pnpm
+RUN pnpm i --frozen-lockfile
 
 COPY . ./
 
+ARG NODE_ENV=production
+
 RUN git submodule update --init
-RUN yarn build
+RUN pnpm build
 
 FROM node:${NODE_VERSION}-slim AS runner
 
@@ -37,10 +37,10 @@ RUN apt-get update \
 	&& groupadd -g "${GID}" misskey \
 	&& useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey
 
+RUN npm i -g pnpm
 USER misskey
 WORKDIR /misskey
 
-COPY --chown=misskey:misskey --from=builder /misskey/.yarn/install-state.gz ./.yarn/install-state.gz
 COPY --chown=misskey:misskey --from=builder /misskey/node_modules ./node_modules
 COPY --chown=misskey:misskey --from=builder /misskey/built ./built
 COPY --chown=misskey:misskey --from=builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
@@ -51,4 +51,4 @@ COPY --chown=misskey:misskey . ./
 
 ENV NODE_ENV=production
 ENTRYPOINT ["/usr/bin/tini", "--"]
-CMD ["yarn", "run", "migrateandstart"]
+CMD ["pnpm", "run", "migrateandstart"]
-- 
cgit v1.2.3-freya