From bbb2d39e5a427e5cb2b2aa7a52917c81d6ed158c Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Tue, 17 Nov 2020 22:01:10 +0100
Subject: [PATCH] [Etherpad] Bump script for deletion and remove deleted pads
creation from Etherpad
---
pica-etherpad/Dockerfile | 6 +-----
pica-etherpad/standard/docker-compose.yml | 4 ++--
pica-etherpad/week/docker-compose.yml | 4 ++--
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index a1260833..7a1c4c6a 100644
--- a/pica-etherpad/Dockerfile
+++ b/pica-etherpad/Dockerfile
@@ -72,22 +72,18 @@ ARG UID=5004
RUN useradd --uid ${UID} --create-home etherpad
+# Used to avoid very long chown (due to https://github.com/docker/for-linux/issues/388)
USER etherpad
# Import des fichiers téléchargés dans l'image downloader
COPY --from=downloader /opt/etherpad-lite /opt/etherpad-lite/
-
# Install debian packages, as root
USER root
RUN apt-get update && \
apt-get install -y curl nano postgresql-client abiword && \
rm -rf /var/lib/apt/lists/*
-# Created folder for deleted pads
-RUN mkdir /opt/etherpad-lite/deleted_pads && \
- chown -R etherpad:etherpad /opt/etherpad-lite/deleted_pads
-
# Set etherpad as owner of etherpad (permission for its content was already set in downloader)
RUN chown etherpad:etherpad /opt/etherpad-lite
diff --git a/pica-etherpad/standard/docker-compose.yml b/pica-etherpad/standard/docker-compose.yml
index a9896925..6c600c1c 100644
--- a/pica-etherpad/standard/docker-compose.yml
+++ b/pica-etherpad/standard/docker-compose.yml
@@ -58,10 +58,10 @@ services:
restart: unless-stopped
delete-pad-after-delay:
- image: registry.picasoft.net/pica-etherpad-delete-after-delay:picasoft-docker.1.0
+ image: registry.picasoft.net/pica-etherpad-delete-after-delay:picasoft-docker.1.0.1
container_name: etherpad_delete-pad-after-delay
build:
- context: https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git#picasoft-docker.1.0
+ context: https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git#picasoft-docker.1.0.1
volumes:
- api-key:/mountedAPIkey:ro
- deleted-pads:/opt/etherpad-lite/deleted_pads
diff --git a/pica-etherpad/week/docker-compose.yml b/pica-etherpad/week/docker-compose.yml
index 3276fb63..782dc866 100644
--- a/pica-etherpad/week/docker-compose.yml
+++ b/pica-etherpad/week/docker-compose.yml
@@ -59,10 +59,10 @@ services:
restart: unless-stopped
delete-pad-after-delay:
- image: registry.picasoft.net/pica-etherpad-delete-after-delay:picasoft-docker.1.0
+ image: registry.picasoft.net/pica-etherpad-delete-after-delay:picasoft-docker.1.0.1
container_name: etherpad_delete-pad-after-delay
build:
- context: https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git#picasoft-docker.1.0
+ context: https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git#picasoft-docker.1.0.1
volumes:
- api-key:/mountedAPIkey:ro
- deleted-pads:/opt/etherpad-lite/deleted_pads
--
GitLab