From 33960c641d6d71a56f17c66420adab118f50d79f Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <ernaxe@crans.org>
Date: Thu, 30 Dec 2021 10:36:32 +0100
Subject: [PATCH] Use upstream EtherPad image

---
 Dockerfile          | 13 -------------
 docker-compose.yml  |  6 +++++-
 etherpad/Dockerfile |  6 ------
 3 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 Dockerfile
 delete mode 100644 etherpad/Dockerfile

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index c968e28..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM python:3-alpine
-LABEL description="A Matrix bot for Alertmanager"
-# Instal gcc to build wheels
-RUN apk add --no-cache gcc musl-dev
-# Force the stdout and stderr streams to be unbuffered
-ENV PYTHONUNBUFFERED 1
-# Install requirements from PyPI
-COPY requirements.txt requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
-# Copy the all the necessary files
-COPY . .
-EXPOSE 8000
-ENTRYPOINT python3 bot.py
diff --git a/docker-compose.yml b/docker-compose.yml
index c4fdeb6..e45fef3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,10 +47,14 @@ services:
       - 8083:8080
 
   etherpad:
-    build: etherpad
+    image: etherpad/etherpad:1.8.16
     restart: always
     environment:
+      NODE_ENV: "production"
+      TRUST_PROXY: "true"
       POSTGRES_PASSWORD: "${ETHERPAD_DB_PASSWORD}"
+    volumes:
+      - ./etherpad/settings.json:/opt/etherpad-lite/settings.json:ro
     ports:
       - 8084:9001
 
diff --git a/etherpad/Dockerfile b/etherpad/Dockerfile
deleted file mode 100644
index 6cef93f..0000000
--- a/etherpad/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM etherpad/etherpad:1.8.16
-
-# Change instance settings
-ENV NODE_ENV=production
-ENV TRUST_PROXY=true
-COPY settings.json /opt/etherpad-lite/settings.json