mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-26 10:26:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Fixed docker build.

Browse source
This commit is contained in:
SamTV12345 2024-02-24 10:50:26 +01:00
parent 131c7e322b
commit 3b6a9ccdb3
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

@ -96,7 +96,8 @@ FROM build as development
COPY --chown=etherpad:etherpad ./src/package.json .npmrc ./src/pnpm-lock.yaml ./src/ COPY --chown=etherpad:etherpad ./src/package.json .npmrc ./src/pnpm-lock.yaml ./src/
RUN bin/installDeps.sh && { [ -z "${ETHERPAD_PLUGINS}" ] || \ RUN bin/installDeps.sh && { [ -z "${ETHERPAD_PLUGINS}" ] || \
pnpm install --workspace-root ${ETHERPAD_PLUGINS}; } pnpm install --workspace-root ${ETHERPAD_PLUGINS}; } \
RUN pnpm run next-build
FROM build as production FROM build as production
@ -106,8 +107,7 @@ ENV ETHERPAD_PRODUCTION=true
COPY --chown=etherpad:etherpad ./src ./src COPY --chown=etherpad:etherpad ./src ./src
RUN bin/installDeps.sh && { [ -z "${ETHERPAD_PLUGINS}" ] || \ RUN bin/installDeps.sh && { [ -z "${ETHERPAD_PLUGINS}" ] || \
pnpm install --workspace-root ${ETHERPAD_PLUGINS}; } && \ pnpm install --workspace-root ${ETHERPAD_PLUGINS}; } && pnpm run next-build
rm -rf ~/.npm
# Copy the configuration file. # Copy the configuration file.
COPY --chown=etherpad:etherpad ${SETTINGS} "${EP_DIR}"/settings.json COPY --chown=etherpad:etherpad ${SETTINGS} "${EP_DIR}"/settings.json

3
package.json
View file

@ -19,7 +19,8 @@
"dev": "pnpm --filter ep_etherpad-lite run dev", "dev": "pnpm --filter ep_etherpad-lite run dev",
"prod": "pnpm --filter ep_etherpad-lite run prod", "prod": "pnpm --filter ep_etherpad-lite run prod",
"ts-check": "pnpm --filter ep_etherpad-lite run ts-check", "ts-check": "pnpm --filter ep_etherpad-lite run ts-check",
"ts-check:watch": "pnpm --filter ep_etherpad-lite run ts-check:watch" "ts-check:watch": "pnpm --filter ep_etherpad-lite run ts-check:watch",
"next-build": "pnpm --filter ep_etherpad-lite run build-next"
}, },
"dependencies": { "dependencies": {
"ep_etherpad-lite": "workspace:./src" "ep_etherpad-lite": "workspace:./src"

3
src/package.json
View file

@ -123,7 +123,8 @@
"dev": "node --import tsx node/server.ts", "dev": "node --import tsx node/server.ts",
"prod": "node --import tsx node/server.ts", "prod": "node --import tsx node/server.ts",
"ts-check": "tsc --noEmit", "ts-check": "tsc --noEmit",
"ts-check:watch": "tsc --noEmit --watch" "ts-check:watch": "tsc --noEmit --watch",
"build-next": "next build"
}, },
"version": "1.9.7", "version": "1.9.7",
"license": "Apache-2.0" "license": "Apache-2.0"