further refactoring

This commit is contained in:
Jannik Streek 2024-02-16 11:03:40 +01:00
parent d3573d1f54
commit 3ef07e5d91
4 changed files with 15 additions and 5 deletions

View file

@ -87,7 +87,9 @@ FROM build as development
COPY --chown=etherpad:etherpad ./src/package.json .npmrc ./src/pnpm-lock.yaml ./src/
COPY --chown=etherpad:etherpad ./src/bin ./src/bin
COPY --chown=etherpad:etherpad ${SETTINGS} "${EP_DIR}"/settings.json
COPY --chown=etherpad:etherpad ./var ./var
COPY --chown=etherpad:etherpad ./node_modules ./node_modules
COPY --chown=etherpad:etherpad ${SETTINGS} ./settings.json
RUN { [ -z "${ETHERPAD_PLUGINS}" ] || \
pnpm install --no-save --legacy-peer-deps ${ETHERPAD_PLUGINS}; } && \
@ -101,7 +103,10 @@ FROM build as production
ENV NODE_ENV=production
ENV ETHERPAD_PRODUCTION=true
COPY --chown=etherpad:etherpad ./ ./
COPY --chown=etherpad:etherpad ./src ./src
COPY --chown=etherpad:etherpad ./var ./var
COPY --chown=etherpad:etherpad ./node_modules ./node_modules
COPY --chown=etherpad:etherpad ${SETTINGS} ./settings.json
# Plugins must be installed before installing Etherpad's dependencies, otherwise
# npm will try to hoist common dependencies by removing them from