diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile index 2ace5a2886fc21103ac07ddef3c957a58a142b43..53136bc3cc2e8585492204721f64c6447774bdd0 100644 --- a/pica-etherpad/Dockerfile +++ b/pica-etherpad/Dockerfile @@ -36,8 +36,10 @@ RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}. npm install \ ep_align \ ep_author_hover \ + ep_better_pdf_export \ ep_chatdate \ ep_comments_page \ + ep_countable \ ep_delete_empty_pads \ ep_font_color \ ep_font_family \ @@ -67,7 +69,7 @@ FROM base COPY entrypoint.sh /opt/etherpad-lite/entrypoint.sh RUN apt-get update && \ - apt-get install -y mysql-client && \ + apt-get install -y mysql-client abiword && \ chmod +x /opt/etherpad-lite/entrypoint.sh && \ mkdir -p /opt/etherpad-lite && \ chown -R node /opt/etherpad-lite && \ diff --git a/pica-etherpad/entrypoint.sh b/pica-etherpad/entrypoint.sh index 08d62e06dd901f55249412791625f9768fa2e370..d9d27619c944a1d4f64d92965a71840890867bb9 100644 --- a/pica-etherpad/entrypoint.sh +++ b/pica-etherpad/entrypoint.sh @@ -51,9 +51,6 @@ Prenez des notes et rédigez des documents librement !\n\n \ Pensez à garder l'URL de votre pad pour le retrouver. Attention, celui-ci est public, c'est-à-dire que toute personne possédant l'URL pourra y accéder :\ n'y stockez pas d'informations confidentielles !"} -# Print table of content by default -: ${ETHERPAD_TOC:=false} - # Check if database already exists RESULT=`mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} \ -h${MYSQL_PORT_3306_TCP_ADDR} --skip-column-names \ @@ -83,7 +80,7 @@ cat <<- EOF > /opt/etherpad-lite/settings.json "minify": ${ETHERPAD_MINIFY}, "skinName": "${ETHERPAD_THEME}", "defaultPadText": "${ETHERPAD_DEFAULT_TEXT}", - "ep_toc": ${ETHERPAD_TOC}, + "abiword" : "/usr/bin/abiword", EOF if [ $ETHERPAD_ADMIN_PASSWORD ]; then