From 1c55bea856555cf69e2239133544eb1da486d3b3 Mon Sep 17 00:00:00 2001
From: Igor WITZ <igor.witz@etu.utc.fr>
Date: Thu, 18 Oct 2018 11:14:52 +0200
Subject: [PATCH] =?UTF-8?q?r=C3=A9duction=20nombre=20de=20stages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pica-etherpad/Dockerfile | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index bc2ce310..7c564e58 100644
--- a/pica-etherpad/Dockerfile
+++ b/pica-etherpad/Dockerfile
@@ -33,6 +33,23 @@ RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.
mv etherpad-lite-${ETHERPAD_VERSION}/* . && \
mkdir -p src/templates && \
mkdir -p static && \
+ bin/installDeps.sh && \
+ rm settings.json && \
+ npm install \
+ ep_align \
+ ep_author_hover \
+ ep_comments_page \
+ ep_countable \
+ ep_delete_empty_pads \
+ ep_font_color \
+ ep_headings2 \
+ ep_markdown \
+ ep_pads_stats \
+ ep_page_view \
+ ep_spellcheck \
+ ep_subscript_and_superscript \
+ ep_table_of_contents \
+ ep_user_font_size && \
git clone https://framagit.org/DeBugs/picasoft-etherpad-landing-page.git src/templates/picasoft-etherpad-landing-page && \
git --git-dir=src/templates/picasoft-etherpad-landing-page/.git checkout ${ETHERPAD_LANDING_PAGE_VERSION} && \
cp src/templates/picasoft-etherpad-landing-page/index.html src/templates/index.html && \
@@ -54,29 +71,6 @@ RUN apt-get update && \
# import des fichiers téléchargés dans l'image downloader
COPY --from=downloader --chown=node /opt/etherpad-lite /opt/etherpad-lite/
-USER node
-WORKDIR /opt/etherpad-lite
-
-# installation de dépendances supplémentaires
-RUN bin/installDeps.sh && \
- rm settings.json && \
- npm install \
- ep_align \
- ep_author_hover \
- ep_comments_page \
- ep_countable \
- ep_delete_empty_pads \
- ep_font_color \
- ep_headings2 \
- ep_markdown \
- ep_pads_stats \
- ep_page_view \
- ep_spellcheck \
- ep_subscript_and_superscript \
- ep_table_of_contents \
- ep_user_font_size
-
-
ENTRYPOINT ["/entrypoint.sh"]
CMD /bin/bash -c "/opt/etherpad-lite/bin/run.sh"
HEALTHCHECK CMD curl -s 127.0.0.1:${ETHERPAD_PORT:=8080}
--
GitLab