Use upstream EtherPad image

This commit is contained in:
Alexandre Iooss 2021-12-30 10:36:32 +01:00 committed by root
parent 8732f37d09
commit 33960c641d
3 changed files with 5 additions and 20 deletions

View file

@ -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

View file

@ -47,10 +47,14 @@ services:
- 8083:8080 - 8083:8080
etherpad: etherpad:
build: etherpad image: etherpad/etherpad:1.8.16
restart: always restart: always
environment: environment:
NODE_ENV: "production"
TRUST_PROXY: "true"
POSTGRES_PASSWORD: "${ETHERPAD_DB_PASSWORD}" POSTGRES_PASSWORD: "${ETHERPAD_DB_PASSWORD}"
volumes:
- ./etherpad/settings.json:/opt/etherpad-lite/settings.json:ro
ports: ports:
- 8084:9001 - 8084:9001

View file

@ -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