From a963fea9a444f357e68bc983b39dc14f1c63b1d2 Mon Sep 17 00:00:00 2001
From: R01 <romain@maliach.fr>
Date: Sat, 14 Nov 2020 17:27:45 +0100
Subject: [PATCH] moved ABIWORD env from d-c.yml to dockerfile
---
pica-etherpad/Dockerfile | 1 +
pica-etherpad/docker-compose.yml | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index 1343f79e..78bdbd77 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 112df456..8da398c0 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:
--
GitLab