From a75381e512cba2f7956e21ac7c95e57c0e0c0ce6 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Wed, 17 Mar 2021 01:27:00 +0000
Subject: [PATCH] etherpad: check out specific commit & revert to npm install
 again

---
 images/etherpad/Dockerfile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/images/etherpad/Dockerfile b/images/etherpad/Dockerfile
index 26c5856..bcaf230 100644
--- a/images/etherpad/Dockerfile
+++ b/images/etherpad/Dockerfile
@@ -1,17 +1,24 @@
 ARG REPO_LOCATION
 # ARG BASE_VERSION
 
-FROM ${REPO_LOCATION}minideb-node AS builder 
+FROM ${REPO_LOCATION}minideb-node AS builder
+
+# This is release 1.8.12
+# It's important we checkout a specific commit, otherwise etherpad checks out the latest from develop O.o
+ARG COMMIT=b99c2cae22f35a0c0831e2fef0719f115b486bd9
 
 RUN install_packages git ca-certificates python3 make gcc g++ libc-dev libc++-dev
 
-RUN mkdir -p /srv && git clone --branch master https://github.com/ether/etherpad-lite.git /srv/etherpad
+RUN mkdir -p /srv \
+	&& git clone --branch master https://github.com/ether/etherpad-lite.git /srv/etherpad \
+	&& cd /srv/etherpad && git checkout "${COMMIT}" \
+	&& git status
 
 ENV PYTHON /usr/bin/python3
 
 RUN cd /srv/etherpad \
 	&& ln -s /usr/bin/python3 /usr/bin/python \
-	&& npm clean-install \
+	&& npm install \
 	&& npm install sqlite3 \
 	&& rm -rf /srv/etherpad/.git