diff --git a/README.md b/README.md index 2bad343..3fbba23 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ LETSENCRYPT_EMAIL=bike@bikelover.org ``` ## EtherPad Plugins -Here are the default plugins installed by npm for etherdraw: +Here are some recommended plugins for etherpad, which include etherdraw functionality: ``` ep_adminpads ep_align ep_authornames ep_comments_page \ @@ -57,7 +57,17 @@ Here are the default plugins installed by npm for etherdraw: ep_page_view ep_print ep_simpletextsearch ep_spellcheck ``` -To change, simply edit [etherpad/Dockerfile](https://github.com/fspc/etherpad-and-draw-node-alpine/blob/master/etherpad/Dockerfile) after `RUN npm install`. +To install, simply run these two docker-compose commands after running docker-compose up -d: + +``` + docker-compose exec etherpad npm install \ + ep_adminpads ep_align ep_authornames ep_comments_page \ + ep_copy_paste_images ep_define ep_draw ep_font_color ep_font_family \ + ep_font_size ep_headings ep_message_all ep_offline_edit \ + ep_page_view ep_print ep_simpletextsearch ep_spellcheck; + + docker-compose restart etherpad; +``` If any of the plugins require configuration, simply edit [etherpad/entrypoint.sh](https://github.com/fspc/etherpad-and-draw-node-alpine/blob/master/etherpad/entrypoint.sh) between `cat <<- EOF > settings.json` and `EOF`. diff --git a/etherpad/Dockerfile b/etherpad/Dockerfile index 413b4d9..a1f8de8 100644 --- a/etherpad/Dockerfile +++ b/etherpad/Dockerfile @@ -1,14 +1,8 @@ -# node 9.2 -FROM node:9.4.0-alpine +# node 9.11.1 +FROM node:9.11.1-alpine MAINTAINER Jonathan Rosenbaum -# npm WARN deprecated jade@0.26.3: Jade has been renamed to pug, please install the latest version of pug instead of jade -# npm WARN deprecated node-uuid@1.4.8: Use uuid module instead -# npm WARN deprecated minimatch@0.2.14: Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue -# npm WARN deprecated graceful-fs@2.0.3: graceful-fs v3.0.0 and before will fail on node releases >= v7.0. Please update to graceful-fs@^4.0.0 as soon as possible. Use 'npm ls graceful-fs' to find it in the tree. -# npm WARN deprecated minimatch@1.0.0: Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue - -ENV ETHERPAD_VERSION 1.6.2 +ENV ETHERPAD_VERSION 1.6.6 RUN apk update; apk add bash curl gzip unzip mysql-client @@ -21,20 +15,14 @@ RUN curl -SL \ WORKDIR etherpad-lite -COPY installDeps.sh /opt/etherpad-lite/bin/installDeps.sh - RUN bin/installDeps.sh && rm settings.json COPY entrypoint.sh /entrypoint.sh -#COPY installDeps.sh /opt/etherpad-lite/bin/installDeps.sh RUN sed -i 's/^node/exec\ node/' bin/run.sh +RUN sed -i 's/^bin/##bin/' bin/run.sh VOLUME /opt/etherpad-lite/var /opt/etherpad-lite/node_modules RUN ln -s var/settings.json settings.json -RUN npm install ep_adminpads ep_align ep_authornames ep_comments_page \ - ep_copy_paste_images ep_define ep_draw ep_font_color ep_font_family \ - ep_font_size ep_headings ep_message_all ep_offline_edit \ - ep_page_view ep_print ep_simpletextsearch ep_spellcheck EXPOSE 9001 ENTRYPOINT ["/entrypoint.sh"]