From 475ef7a05c9e7bb34cbf81a2f11cdcdcbe30c215 Mon Sep 17 00:00:00 2001 From: chandi Date: Sun, 25 Jan 2026 18:38:57 +0100 Subject: [PATCH] etherpad 2.6.0 with fixed plugins userName and userColor had to be changed from "false" to "null", to avoid following error: "Error: COLLABROOM: USERINFO_UPDATE: malformed color: false" See https://github.com/ether/etherpad-lite/issues/5799#issuecomment-1616186527 --- docker-compose.tmpl.yml | 4 ++-- mod/etherpad/Dockerfile | 6 +++--- mod/etherpad/settings.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml index 6c9993a2..1d4a5bbd 100644 --- a/docker-compose.tmpl.yml +++ b/docker-compose.tmpl.yml @@ -161,8 +161,8 @@ services: - plugin=./repos/bbb-etherpad-plugin - skin=./repos/bbb-etherpad-skin args: - TAG_ETHERPAD: "2.4.2" - image: alangecker/bbb-docker-etherpad:2.4.2-s{{ .Env.COMMIT_ETHERPAD_SKIN }}-p{{ .Env.COMMIT_ETHERPAD_PLUGIN }} + TAG_ETHERPAD: "2.6.0" + image: alangecker/bbb-docker-etherpad:2.6.0-s{{ .Env.COMMIT_ETHERPAD_SKIN }}-p{{ .Env.COMMIT_ETHERPAD_PLUGIN }} restart: unless-stopped depends_on: - redis diff --git a/mod/etherpad/Dockerfile b/mod/etherpad/Dockerfile index 1633561d..dc933c91 100644 --- a/mod/etherpad/Dockerfile +++ b/mod/etherpad/Dockerfile @@ -9,11 +9,11 @@ USER etherpad RUN pnpm run plugins i \ ep_disable_chat@0.0.13 \ - ep_auth_session@1.1.1 \ --github \ + alangecker/ep_auth_session#2e7ae294baa650ba3deca5bab7d1db734b2757a4 \ mconf/ep_cursortrace#56fb8c2b211cdda4fc8715ec99e1cb7b7d9eb851 \ - mconf/ep_pad_ttl#360136cd38493dd698435631f2373cbb7089082d \ - mconf/ep_redis_publisher#2b6e47c1c59362916a0b2961a29b259f2977b694 + alangecker/ep_pad_ttl#3a3530b7f618e794d0bade34324d2af709b527ba \ + alangecker/ep_redis_publisher#b86ce4e07e4579bf2345be2a0e3fed59b6be92ba # add skin from git submodule diff --git a/mod/etherpad/settings.json b/mod/etherpad/settings.json index d3c1c4e4..48cccebd 100644 --- a/mod/etherpad/settings.json +++ b/mod/etherpad/settings.json @@ -243,8 +243,8 @@ "showChat": false, "showLineNumbers": false, "useMonospaceFont": false, - "userName": false, - "userColor": false, + "userName": null, + "userColor": null, "rtl": false, "alwaysShowChat": false, "chatAndUsers": false,