From 78781ecfa031c68702e3ba2a0508c25a4f7a2f52 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 18 May 2020 20:21:11 +0000 Subject: [PATCH] Upgrade Etherpad to 1.8.4 Release notes for 1.8.3 and 1.8.4 mention a number of useful fixes (there was no 1.8.1 nor 1.8.2). In particular, a workaround was included for a known source of client-side hangs (some of our broken "loading..." pads appear to exhibit similar log entries suggesting this could address that long-standing problem). Unfortunately, in the breaking changes, it's noted that plugin compatibility may be impacted so we should test the one plugin we're using to make sure it's still okay. We force the skinName setting to no-skin as the default has changed to colibris in 1.8.3. We don't want colibris, at least not yet, as it breaks our existing headings plugin. We also make a small change to the css in the editor so that each line has its text fully rendered. See https://github.com/ether/etherpad-lite/issues/4106 for more details. Change-Id: Ieae29a1d0fe28f879abd35b191291357bb5d3f2c --- docker/etherpad/Dockerfile | 8 ++++++-- playbooks/roles/etherpad/templates/settings.json.j2 | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docker/etherpad/Dockerfile b/docker/etherpad/Dockerfile index f0dd71d5a8..111b1dc5c5 100644 --- a/docker/etherpad/Dockerfile +++ b/docker/etherpad/Dockerfile @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/etherpad/etherpad:1.8.0 +FROM docker.io/etherpad/etherpad:1.8.4 LABEL maintainer="infra-root@openstack.org" -RUN cd /opt/etherpad-lite && npm install ep_headings +# Install the headings plugin and fix css on 1.8.4. +# Newer etherpad shouldn't need the css fix. +RUN cd /opt/etherpad-lite && npm install ep_headings \ + && sed -i -e 's/padding: 6px 0 !important;/padding: 0 0 !important;/' \ + /opt/etherpad-lite/src/static/css/iframe_editor.css diff --git a/playbooks/roles/etherpad/templates/settings.json.j2 b/playbooks/roles/etherpad/templates/settings.json.j2 index 15d0154560..f645731278 100644 --- a/playbooks/roles/etherpad/templates/settings.json.j2 +++ b/playbooks/roles/etherpad/templates/settings.json.j2 @@ -29,6 +29,10 @@ "charset" : "utf8mb4", "database": "etherpad-lite" }, + + //force no skin as default has changed to colibris + "skinName": "no-skin", + //the default text of a pad "defaultPadText" : "Welcome to OpenDev Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nOpenDev: https://opendev.org\nEtherpad on Github: https://github.com/ether/etherpad-lite\n",