diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile index 1343f79e22e45d2e79d5732f3a1422baaa39921a..78bdbd77630741b1da6c68d7d346bd3783c743e0 100644 --- a/pica-etherpad/Dockerfile +++ b/pica-etherpad/Dockerfile @@ -104,4 +104,5 @@ USER etherpad EXPOSE 8080 HEALTHCHECK --interval=20s --timeout=3s CMD curl --fail http://localhost:8080 || exit 1 WORKDIR /opt/etherpad-lite/ +ENV ABIWORD "/usr/bin/abiword" #installed here by debian ENTRYPOINT ["/opt/etherpad-lite/entrypoint.sh", "/opt/etherpad-lite/bin/run.sh" ] diff --git a/pica-etherpad/docker-compose.yml b/pica-etherpad/docker-compose.yml index 112df4563269508ca275a29505c394a9cd30da97..8da398c0053e9cc7472300cb832a49eaf6fa5bd2 100755 --- a/pica-etherpad/docker-compose.yml +++ b/pica-etherpad/docker-compose.yml @@ -84,7 +84,6 @@ services: THEME: "colibris" TITLE: "Picapad" TRUST_PROXY: "true" - ABIWORD: "/usr/bin/abiword" networks: - proxy - standard_app-db @@ -116,7 +115,6 @@ services: THEME: "colibris" TITLE: "Picapad Hebdo" TRUST_PROXY: "true" - ABIWORD: "/usr/bin/abiword" depends_on: - week_db networks: