From 884ee6d7dce065355819df2ad085e4598d94690b Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Thu, 20 Aug 2020 13:54:41 +0200
Subject: [PATCH] [Etherpad] Remove --chown flag (not available before Docker
17.09)
---
pica-etherpad/Dockerfile | 3 ++-
pica-etherpad/docker-compose.yml | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index 140fc9b5..67fb11bd 100644
--- a/pica-etherpad/Dockerfile
+++ b/pica-etherpad/Dockerfile
@@ -57,7 +57,8 @@ COPY entrypoint.sh /opt/etherpad-lite/entrypoint.sh
RUN useradd --uid ${UID} --create-home etherpad
# Import des fichiers téléchargés dans l'image downloader
-COPY --from=downloader --chown=etherpad /opt/etherpad-lite /opt/etherpad-lite/
+COPY --from=downloader /opt/etherpad-lite /opt/etherpad-lite/
+RUN chown -R etherpad /opt/etherpad-lite
RUN apt-get update && \
apt-get install -y curl nano postgresql-client && \
diff --git a/pica-etherpad/docker-compose.yml b/pica-etherpad/docker-compose.yml
index 55ff0570..44bf014b 100755
--- a/pica-etherpad/docker-compose.yml
+++ b/pica-etherpad/docker-compose.yml
@@ -70,6 +70,7 @@ services:
etherpad-week-app:
image: registry.picasoft.net/pica-etherpad:1.8.4
container_name: etherpad-week-app
+ build: .
depends_on:
- etherpad-week-db
security_opt:
--
GitLab