From 44c226368a0df29cffb831107d7d8cebc8d95c6a Mon Sep 17 00:00:00 2001
From: Jannik Streek <jannik.streek@gmail.com>
Date: Mon, 19 Feb 2024 17:53:08 +0100
Subject: [PATCH] fix docker install

---
 .github/workflows/backend-tests.yml | 2 +-
 Dockerfile                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
index 47678548c..4f94a7271 100644
--- a/.github/workflows/backend-tests.yml
+++ b/.github/workflows/backend-tests.yml
@@ -223,7 +223,7 @@ jobs:
         # The --legacy-peer-deps flag is required to work around a bug in npm
         # v7: https://github.com/npm/cli/issues/2199
         run: >
-          pnpm install
+          pnpm install --workspace-root
           ep_align
           ep_author_hover
           ep_cursortrace
diff --git a/Dockerfile b/Dockerfile
index 8523fe342..bb000449c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -98,7 +98,7 @@ COPY --chown=etherpad:etherpad ./src/package.json .npmrc ./src/pnpm-lock.yaml ./
 COPY --chown=etherpad:etherpad ./src/bin ./src/bin
 
 RUN { [ -z "${ETHERPAD_PLUGINS}" ] || \
-      pnpm install --no-save --legacy-peer-deps ${ETHERPAD_PLUGINS}; } && \
+      pnpm install --workspace-root ${ETHERPAD_PLUGINS}; } && \
     src/bin/installDeps.sh
 
 FROM build as production
@@ -120,7 +120,7 @@ COPY --chown=etherpad:etherpad ./src ./src
 # seems to confuse tools such as `npm outdated`, `npm update`, and some ESLint
 # rules.
 RUN { [ -z "${ETHERPAD_PLUGINS}" ] || \
-      pnpm install --no-save --legacy-peer-deps ${ETHERPAD_PLUGINS}; } && \
+      pnpm install --workspace-root ${ETHERPAD_PLUGINS}; } && \
     src/bin/installDeps.sh && \
     rm -rf ~/.npm