opendev/system-config
Code Issues Proposed changes

Update etherpad to 1.8.18

Browse Source 
This appears to be a minor bugfix update, but there is no reason for us
to fall behind. Changelog can be found at:

  https://github.com/ether/etherpad-lite/blob/1.8.18/CHANGELOG.md#1818

Change-Id: If675da1f3599898bddcc41a4aeb9ef9e9c2fc281
This commit is contained in:
Clark Boylan 2022-05-06 09:09:36 -07:00
parent 72eeb7548c
commit 6cd52a9ee4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/etherpad/Dockerfile
View File

@ -22,7 +22,7 @@
# #
# Author: muxator # Author: muxator
FROM node:lts-slim FROM node:14-buster-slim
LABEL maintainer="infra-root@openstack.org" LABEL maintainer="infra-root@openstack.org"
# plugins to install while building the container. By default no plugins are # plugins to install while building the container. By default no plugins are
@ -93,7 +93,7 @@ USER etherpad
RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR} RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR}
WORKDIR "${EP_DIR}" WORKDIR "${EP_DIR}"
RUN git checkout 1.8.17 RUN git checkout 1.8.18
# Plugins must be installed before installing Etherpad's dependencies, otherwise # Plugins must be installed before installing Etherpad's dependencies, otherwise
# npm will try to hoist common dependencies by removing them from # npm will try to hoist common dependencies by removing them from
@ -104,7 +104,7 @@ RUN git checkout 1.8.17
# seems to confuse tools such as `npm outdated`, `npm update`, and some ESLint # seems to confuse tools such as `npm outdated`, `npm update`, and some ESLint
# rules. # rules.
RUN { [ -z "${ETHERPAD_PLUGINS}" ] || \ RUN { [ -z "${ETHERPAD_PLUGINS}" ] || \
npm install --no-save --legacy-peer-deps ${ETHERPAD_PLUGINS}; } && \ npm install --no-save ${ETHERPAD_PLUGINS}; } && \
src/bin/installDeps.sh && \ src/bin/installDeps.sh && \
rm -rf ~/.npm rm -rf ~/.npm