mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-19 23:25:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Added new command to setup etherpad. Fixed Dockerfile

Browse source
This commit is contained in:
SamTV12345 2024-07-23 17:43:18 +02:00
parent a2ad4b1975
commit 550a29f3e6
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.dockerignore
View file

@ -25,3 +25,5 @@ Dockerfile
settings.json settings.json
src/node_modules src/node_modules
admin/node_modules admin/node_modules
ui/node_modules
node_modules

16
Dockerfile
View file

@ -5,11 +5,11 @@
# Author: muxator # Author: muxator
FROM node:alpine AS adminbuild FROM node:alpine AS adminbuild
RUN npm install -g pnpm@9.0.4
WORKDIR /opt/etherpad-lite WORKDIR /opt/etherpad-lite
COPY ./ ./ COPY . .
RUN cd ./admin && npm install -g pnpm@9.0.4 && pnpm install && pnpm run build --outDir ./dist RUN pnpm install
RUN cd ./ui && pnpm install && pnpm run build --outDir ./dist RUN pnpm run build:ui
FROM node:alpine AS build FROM node:alpine AS build
@ -115,8 +115,8 @@ COPY --chown=etherpad:etherpad ./pnpm-workspace.yaml ./package.json ./
FROM build AS development FROM build AS development
COPY --chown=etherpad:etherpad ./src/package.json .npmrc ./src/ COPY --chown=etherpad:etherpad ./src/package.json .npmrc ./src/
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/admin/dist ./src/templates/admin COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/ templates/admin./src/templates/admin
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/ui/dist ./src/static/oidc COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/static/oidc ./src/static/oidc
RUN bin/installDeps.sh && \ RUN bin/installDeps.sh && \
if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then \ if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then \
@ -130,8 +130,8 @@ ENV NODE_ENV=production
ENV ETHERPAD_PRODUCTION=true ENV ETHERPAD_PRODUCTION=true
COPY --chown=etherpad:etherpad ./src ./src COPY --chown=etherpad:etherpad ./src ./src
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/admin/dist ./src/templates/admin COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/ templates/admin./src/templates/admin
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/ui/dist ./src/static/oidc COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/static/oidc ./src/static/oidc
RUN bin/installDeps.sh && rm -rf ~/.npm && rm -rf ~/.local && rm -rf ~/.cache && \ RUN bin/installDeps.sh && rm -rf ~/.npm && rm -rf ~/.local && rm -rf ~/.cache && \
if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then \ if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then \

3
package.json
View file

@ -29,7 +29,8 @@
"install-plugins": "pnpm --filter bin run plugins i", "install-plugins": "pnpm --filter bin run plugins i",
"remove-plugins": "pnpm --filter bin run remove-plugins", "remove-plugins": "pnpm --filter bin run remove-plugins",
"list-plugins": "pnpm --filter bin run list-plugins", "list-plugins": "pnpm --filter bin run list-plugins",
"build:etherpad": "pnpm --filter admin run build-copy && pnpm --filter ui run build-copy" "build:etherpad": "pnpm --filter admin run build-copy && pnpm --filter ui run build-copy",
"build:ui": "pnpm --filter ui run build-copy && pnpm --filter admin run build-copy"
}, },
"dependencies": { "dependencies": {
"ep_etherpad-lite": "workspace:./src" "ep_etherpad-lite": "workspace:./src"

3
src/node/utils/MinifyWorker.js
View file

@ -26,6 +26,9 @@ const compressCSS = async (content) => {
minify: true, minify: true,
bundle: true, bundle: true,
loader:{ loader:{
'.jpg': 'dataurl',
'.png': 'dataurl',
'.gif': 'dataurl',
'.ttf': 'dataurl', '.ttf': 'dataurl',
'.otf': 'dataurl', '.otf': 'dataurl',
'.woff': 'dataurl', '.woff': 'dataurl',