From 7651a4f5600b0bfc791684cb096907b98340bf86 Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Sat, 1 Jun 2024 19:56:46 +0900 Subject: [PATCH 1/2] build: install pnpm with corepack on build --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9fc2d611cd82..d6ca6b8cdffb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,6 +82,10 @@ RUN apt-get update \ USER misskey WORKDIR /misskey +# add package.json to add pnpm +COPY --chown=misskey:misskey ./package.json ./package.json +RUN corepack install + COPY --chown=misskey:misskey --from=target-builder /misskey/node_modules ./node_modules COPY --chown=misskey:misskey --from=target-builder /misskey/packages/backend/node_modules ./packages/backend/node_modules COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules From daa5acc238937252eeb648045ff3ecd81c0b323c Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Sat, 1 Jun 2024 20:27:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?docs(changelog):=20Docker=E3=82=B3=E3=83=B3?= =?UTF-8?q?=E3=83=86=E3=83=8A=E3=81=AE=E7=AB=8B=E3=81=A1=E4=B8=8A=E3=81=92?= =?UTF-8?q?=E6=99=82=E3=81=AB`pnpm`=E3=81=AE=E3=82=A4=E3=83=B3=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=BC=E3=83=AB=E3=81=A7=E5=9B=BA=E3=81=BE=E3=82=8B?= =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d4ef23d272d..d0e1b8e10a6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## Unreleased ### General -- +- Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題 ### Client -