Commit fa1845d3 authored by Jordi Mallach's avatar Jordi Mallach 🔥 Committed by Maxime Buquet

Drop domain name from /srv subdir.

parent a8ff1bec
......@@ -27,16 +27,15 @@ RUN apt-get update && apt-get install -y \
# Grab the latest Git version
RUN mkdir -p /srv/etherpad.collabora.com/bin && cd /srv/etherpad.collabora.com && git clone https://gitlab.collabora.com/sysadmin/etherpad-lite.git etherpad
RUN mkdir -p /srv/etherpad/bin && cd /srv/etherpad && git clone https://gitlab.collabora.com/sysadmin/etherpad-lite.git etherpad
# Install node dependencies
RUN /srv/etherpad.collabora.com/etherpad/bin/installDeps.sh
RUN /srv/etherpad/etherpad/bin/installDeps.sh
# Add conf files
ADD docker/settings.json.collabora /srv/etherpad.collabora.com/etherpad/settings.json
ADD docker/settings.json.collabora /srv/etherpad/etherpad/settings.json
ADD docker/supervisor.conf /etc/supervisor/supervisor.conf
ADD docker/init_pgsql_db /srv/etherpad.collabora.com/bin
ADD docker/init_pgsql_db /srv/etherpad/bin
EXPOSE 9001
CMD ["/srv/etherpad.collabora.com/bin/init_pgsql_db"]
CMD ["supervisord", "-c", "/etc/supervisor/supervisor.conf", "-n"]
CMD ["/srv/etherpad/bin/init_pgsql_db", "&&", "supervisord", "-c", "/etc/supervisor/supervisor.conf", "-n"]
......@@ -12,7 +12,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
serverurl=unix:///var/run//supervisor.sock
[program:etherpad]
directory=/srv/etherpad.collabora.com/etherpad
directory=/srv/etherpad/etherpad
command=node node_modules/ep_etherpad-lite/node/server.js
user=root
autostart=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