mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-07 07:37:11 -04:00
make version work
This commit is contained in:
parent
3ef07e5d91
commit
56b6f2927d
2 changed files with 9 additions and 6 deletions
13
Dockerfile
13
Dockerfile
|
@ -83,13 +83,17 @@ USER etherpad
|
|||
|
||||
WORKDIR "${EP_DIR}"
|
||||
|
||||
# etherpads version feature requires this. Only copy what is really needed
|
||||
COPY --chown=etherpad:etherpad ./.git/HEAD ./.git/HEAD
|
||||
COPY --chown=etherpad:etherpad ./.git/refs ./.git/refs
|
||||
COPY --chown=etherpad:etherpad ${SETTINGS} ./settings.json
|
||||
COPY --chown=etherpad:etherpad ./var ./var
|
||||
COPY --chown=etherpad:etherpad ./node_modules ./node_modules
|
||||
|
||||
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 ./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}; } && \
|
||||
|
@ -104,9 +108,6 @@ ENV NODE_ENV=production
|
|||
ENV ETHERPAD_PRODUCTION=true
|
||||
|
||||
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
|
||||
|
|
|
@ -11,6 +11,7 @@ services:
|
|||
args:
|
||||
ETHERPAD_PLUGINS:
|
||||
target: development
|
||||
# change to production if needed
|
||||
tty: true
|
||||
stdin_open: true
|
||||
volumes:
|
||||
|
@ -21,6 +22,7 @@ services:
|
|||
- postgres
|
||||
environment:
|
||||
NODE_ENV: development
|
||||
# change to production if needed
|
||||
ADMIN_PASSWORD: ${DOCKER_COMPOSE_APP_DEV_ADMIN_PASSWORD}
|
||||
DB_CHARSET: ${DOCKER_COMPOSE_APP_DEV_ENV_DB_CHARSET:-utf8mb4}
|
||||
DB_HOST: postgres
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue