From b709b36864968caa84e3275b39020a2ddc195e86 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Wed, 17 Mar 2021 02:17:55 +0000
Subject: [PATCH] etherpad: make docer container more like official etherpad
 docker container

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

diff --git a/images/etherpad/Dockerfile b/images/etherpad/Dockerfile
index bcaf230..f491cbc 100644
--- a/images/etherpad/Dockerfile
+++ b/images/etherpad/Dockerfile
@@ -14,23 +14,23 @@ RUN mkdir -p /srv \
 	&& 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 install \
-	&& npm install sqlite3 \
-	&& rm -rf /srv/etherpad/.git
-
-# The rm -rf there is to save some space in the resulting container
-
 ###############################################################################
 
 FROM ${REPO_LOCATION}minideb-node
 
 COPY --from=builder /srv/etherpad /srv/etherpad
 COPY settings.json /srv/etherpad/
+ENV PYTHON /usr/bin/python3
+
 RUN mkdir -p /.npm && chown -R 70:70 /.npm /srv/etherpad
+RUN cd /srv/etherpad \
+	&& ln -s /usr/bin/python3 /usr/bin/python \
+	&& src/bin/installDeps.sh \
+	&& npm install sqlite3 \
+	&& rm -rf /srv/etherpad/.git /.npm/_cacache
+
+# The rm -rf there is to save some space in the resulting container
+
 
 USER 70:70