mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed docker build.

Browse source
This commit is contained in:
SamTV12345 2024-02-24 11:04:10 +01:00
parent 3b6a9ccdb3
commit b6433a91fd
4 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

@ -96,8 +96,7 @@ 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
@ -107,7 +106,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 run next-build pnpm install --workspace-root ${ETHERPAD_PLUGINS}; }
# 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,8 +19,7 @@
"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"

2
src/node/hooks/express/admin.ts
View file

@ -4,7 +4,7 @@ import {ArgsExpressType} from "../../types/ArgsExpressType";
const eejs = require('../../eejs'); const eejs = require('../../eejs');
import next from 'next' import next from 'next'
const app = next({dev: process.env.NODE_ENV !== 'production'}) const app = next({dev: true})
const handle = app.getRequestHandler() const handle = app.getRequestHandler()
/** /**
* Add the admin navigation link * Add the admin navigation link

5
src/package.json
View file

@ -93,7 +93,7 @@
"@types/sinon": "^17.0.3", "@types/sinon": "^17.0.3",
"@types/supertest": "^6.0.2", "@types/supertest": "^6.0.2",
"@types/underscore": "^1.11.15", "@types/underscore": "^1.11.15",
"eslint": "^8.56.0", "eslint": "^8.57.0",
"eslint-config-etherpad": "^3.0.22", "eslint-config-etherpad": "^3.0.22",
"etherpad-cli-client": "^3.0.1", "etherpad-cli-client": "^3.0.1",
"mocha": "^10.3.0", "mocha": "^10.3.0",
@ -123,8 +123,7 @@
"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"