docker: remove supervisord from the Docker image

Supervision/management should not be done from inside the container, but
externally, by container managers.
The container now simply runs node on server.js.

The logs are now readable from docker logs <container_name>.
pull/3585/head
Eddie Barraco 2019-03-20 21:34:38 +01:00 committed by muxator
parent 2955740a6e
commit 7433d749f0
2 changed files with 2 additions and 29 deletions

View File

@ -9,14 +9,6 @@
FROM node:latest
LABEL maintainer="Etherpad team, https://github.com/ether/etherpad-lite"
# install supervisor
RUN apt-get update && apt-get install -y \
supervisor \
&& rm -rf /var/lib/apt/lists/*
# install supervisor.conf in a low layer of the container
ADD supervisor.conf /etc/supervisor/supervisor.conf
# git hash of the version to be built.
# If not given, build the latest development version.
ARG ETHERPAD_VERSION=develop
@ -49,4 +41,5 @@ RUN /opt/etherpad-lite/bin/installDeps.sh
COPY nop setting[s].json /opt/etherpad-lite/
EXPOSE 9001
CMD ["supervisord", "-c", "/etc/supervisor/supervisor.conf", "-n"]
WORKDIR /opt/etherpad-lite
CMD ["node", "node_modules/ep_etherpad-lite/node/server.js"]

View File

@ -1,20 +0,0 @@
[supervisord]
nodaemon=true
[unix_http_server]
file=/var/run//supervisor.sock
chmod=0700
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///var/run//supervisor.sock
[program:etherpad]
directory=/opt/etherpad-lite
command=node node_modules/ep_etherpad-lite/node/server.js
user=root
autostart=true
autorestart=true