Commit 630e4d7c authored by Jordi Mallach's avatar Jordi Mallach 🔥

Do not rely on supervisord.

parent 58ab2529
......@@ -22,7 +22,6 @@ RUN apt-get update && apt-get install -y \
postgresql-client \
python \
sudo \
supervisor \
&& rm -rf /var/lib/apt/lists/*
......@@ -37,8 +36,7 @@ RUN /srv/etherpad/etherpad/bin/installDeps.sh
# Add extra conf files and scripts
ADD docker/settings.json.collabora /srv/etherpad/etherpad/settings.json
ADD docker/supervisor.conf /etc/supervisor/supervisor.conf
ADD docker/run_etherpad /srv/etherpad/bin
EXPOSE 9001
CMD ["/srv/etherpad/bin/run_etherpad"]
WORKDIR /srv/etherpad/etherpad
CMD sleep 2 && node node_modules/ep_etherpad-lite/node/server.js
#!/bin/sh
set -e
supervisord -c /etc/supervisor/supervisor.conf -n
[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=/srv/etherpad/etherpad
command=node node_modules/ep_etherpad-lite/node/server.js
user=root
autostart=true
autorestart=true
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment