diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile index d0243a1ce9a03899eefb16dee6d53b9fb46c8430..adc8d18ea76aa89644f1a8f9c853344c428ee22e 100644 --- a/pica-etherpad/Dockerfile +++ b/pica-etherpad/Dockerfile @@ -10,7 +10,7 @@ FROM base as downloader ARG ETHERPAD_VERSION_BUILD=1.8.0 ARG ETHERPAD_LANDING_PAGE_VERSION_BUILD=v0.1 ARG ETHERPAD_PLUGINS="\ - ep_align ep_author_hover ep_author_neat ep_chatdate ep_colibris_full_width \ + ep_align ep_author_hover ep_chatdate ep_colibris_full_width \ ep_comments_page ep_countable ep_delete_empty_pads ep_font_color \ ep_font_family ep_headings2 ep_markdown ep_pad_activity_nofication_in_title \ ep_pads_stats ep_page_view ep_prompt_for_name ep_set_title_on_pad \ @@ -25,10 +25,8 @@ RUN apt-get update && \ pkg-config \ python \ unzip && \ - mkdir -p /opt/etherpad-lite && \ - chown -R node /opt/etherpad-lite + mkdir -p /opt/etherpad-lite -USER node WORKDIR /opt/etherpad-lite RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION_BUILD}.zip > etherpad.zip && \ unzip etherpad && \ @@ -61,8 +59,8 @@ COPY --from=downloader --chown=etherpad /opt/etherpad-lite /opt/etherpad-lite/ RUN apt-get update && \ apt-get install -y default-mysql-client && \ chmod +x /opt/etherpad-lite/entrypoint.sh && \ - chown -R etherpad /opt/etherpad-lite && \ usermod -d /opt/etherpad-lite etherpad && \ + chown -R etherpad /opt/etherpad-lite && \ rm -rf /var/lib/apt/lists/* EXPOSE 8080 diff --git a/pica-etherpad/docker-compose.yml b/pica-etherpad/docker-compose.yml index 15d05042067ffed6addef98d6f63685a3fd59fd6..8385569379922b08b679f9e94d36c80a1230860a 100755 --- a/pica-etherpad/docker-compose.yml +++ b/pica-etherpad/docker-compose.yml @@ -27,6 +27,7 @@ services: volumes: - ./settings.json:/opt/etherpad-lite/settings.json labels: + traefik.enable: true traefik.frontend.rule: "Host:pad.picasoft.net" traefik.port: 8080 environment: