43778c9f19
Etherpad 1.8.4 added console logging that breaks iframes like those used
by meetpad when logging. THis means many etherpads work fine and only
have an issue when logging is tripped.
We fix this by adding patch files based on the upstream fix,
00b6a1d9fe,
cherrypicked to 1.8.4 and then diffed. The reason we don't just use git
is that while the installation in the upstream image is a git repo there
is not git installation and adding in patch keeps our image small.
We also convert the existing css fix to using patch for consistency.
Change-Id: I7eed0d74c40141255cbff62069a83144feef6b61
34 lines
1.3 KiB
Docker
34 lines
1.3 KiB
Docker
# Copyright (c) 2020 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
FROM docker.io/etherpad/etherpad:1.8.4
|
|
|
|
LABEL maintainer="infra-root@openstack.org"
|
|
|
|
USER root
|
|
RUN export DEBIAN_FRONTEND=noninteractive && \
|
|
apt-get update && \
|
|
apt-get install -y patch && \
|
|
apt-get clean && \
|
|
rm -rf /var/lib/apt/lists/*
|
|
USER etherpad
|
|
# Install the headings plugin and fix css and console logging on 1.8.4.
|
|
# Newer etherpad shouldn't need the css or console fixes.
|
|
COPY patches/ /patches/
|
|
RUN cd /opt/etherpad-lite && npm install ep_headings \
|
|
&& patch /opt/etherpad-lite/src/static/css/iframe_editor.css /patches/iframe_editor.css.patch \
|
|
&& patch /opt/etherpad-lite/src/static/js/ace.js /patches/ace.js.patch \
|
|
&& patch /opt/etherpad-lite/src/static/js/ace2_inner.js /patches/ace2_inner.js.patch
|