From 6cd52a9ee45e299379ba4ddb445fe4928e8b91e9 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 6 May 2022 09:09:36 -0700
Subject: [PATCH] Update etherpad to 1.8.18

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
---
 docker/etherpad/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/etherpad/Dockerfile b/docker/etherpad/Dockerfile
index 6586b50dea..ad66e1b449 100644
--- a/docker/etherpad/Dockerfile
+++ b/docker/etherpad/Dockerfile
@@ -22,7 +22,7 @@
 #
 # Author: muxator
 
-FROM node:lts-slim
+FROM node:14-buster-slim
 LABEL maintainer="infra-root@openstack.org"
 
 # 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}
 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
 # 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
 # rules.
 RUN { [ -z "${ETHERPAD_PLUGINS}" ] || \
-      npm install --no-save --legacy-peer-deps ${ETHERPAD_PLUGINS}; } && \
+      npm install --no-save ${ETHERPAD_PLUGINS}; } && \
     src/bin/installDeps.sh && \
     rm -rf ~/.npm