Update etherpad to current develop branch state
This updates etherpad to the current develop branch state (commit 08f199178d2932cc0ec956aaeb3f62e8a535598a) to pull in a fix after the v2.2.4 release and before v2.2.5. Specifically we're interested in a fix for embedding etherpad as we do with meetpad. If a 2.2.5 release is pushed before this lands we should switch over to that instead. Change-Id: I497c6b434dae54ed808f62143a4c12fb42cc2c47
This commit is contained in:
parent
d03327853e
commit
64d3f79fc4
@ -42,7 +42,10 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
|
|||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
RUN npm install -g pnpm@9.0.4
|
RUN npm install -g pnpm@9.0.4
|
||||||
RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR}
|
RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR}
|
||||||
RUN git checkout v2.2.4
|
# This is a commit after v2.2.4 and before 2.2.5.
|
||||||
|
# We check this out to pickup a fix for embedding etherpad as
|
||||||
|
# we do with meetpad.
|
||||||
|
RUN git checkout 08f199178d2932cc0ec956aaeb3f62e8a535598a
|
||||||
RUN pnpm install
|
RUN pnpm install
|
||||||
RUN pnpm run build:ui
|
RUN pnpm run build:ui
|
||||||
|
|
||||||
@ -149,7 +152,10 @@ 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 v2.2.4
|
# This is a commit after v2.2.4 and before 2.2.5.
|
||||||
|
# We check this out to pickup a fix for embedding etherpad as
|
||||||
|
# we do with meetpad.
|
||||||
|
RUN git checkout 08f199178d2932cc0ec956aaeb3f62e8a535598a
|
||||||
|
|
||||||
FROM build AS development
|
FROM build AS development
|
||||||
ARG ETHERPAD_PLUGINS
|
ARG ETHERPAD_PLUGINS
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
repository: opendevorg/etherpad
|
repository: opendevorg/etherpad
|
||||||
tags:
|
tags:
|
||||||
- latest
|
- latest
|
||||||
- v2.2.4
|
- v2.2.4.dev17
|
||||||
build_args:
|
build_args:
|
||||||
- EP_GID=5001
|
- EP_GID=5001
|
||||||
files: ðerpad_files
|
files: ðerpad_files
|
||||||
|
Loading…
x
Reference in New Issue
Block a user