From 7433d749f00cd389b6e4f8f1f9b1aa0c0a82dd23 Mon Sep 17 00:00:00 2001 From: Eddie Barraco Date: Wed, 20 Mar 2019 21:34:38 +0100 Subject: [PATCH] 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 . --- docker/Dockerfile | 11 ++--------- docker/supervisor.conf | 20 -------------------- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 docker/supervisor.conf diff --git a/docker/Dockerfile b/docker/Dockerfile index e705fb42a..26c2d5738 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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"] diff --git a/docker/supervisor.conf b/docker/supervisor.conf deleted file mode 100644 index 017143b74..000000000 --- a/docker/supervisor.conf +++ /dev/null @@ -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 -