Don't daemonise beam; run in /var/run/catlfish; run as daemon.

Also, point out supervisord.conf, to be explicit.
Also, log everything under /var/run/catlfish.

2 files changed, 11 insertions, 6 deletions

diff --git a/packaging/docker/catlfish-dev/Dockerfile b/packaging/docker/catlfish-dev/Dockerfile
index b3d19cb..9a95417 100644
--- a/packaging/docker/catlfish-dev/Dockerfile
+++ b/packaging/docker/catlfish-dev/Dockerfile
@@ -43,10 +43,15 @@ RUN make -C catlfish PREFIX=/usr/local/catlfish release
 VOLUME /usr/local/catlfish
 VOLUME /var/local/db/catlfish
 
-# Working directory is where catlfish.config is.
-WORKDIR /usr/local/etc/catlfish
+# Working directory is where catlfish.config is. We want to run in
+# /var/run/catlfish and not in /usr/local/etc/catlfish, so symlink.
+RUN mkdir /var/run/catlfish
+RUN ln -s /usr/local/etc/catlfish/catlfish.config /var/run/catlfish/
+WORKDIR /var/run/catlfish
 
-# Run supervisord. TODO: make log- and pidfile end up in
-# /var/run/catlfish
+# Don't run as root.
+USER daemon
+
+# Run supervisord.
 ADD supervisord.conf /etc/supervisor/
-CMD ["/usr/bin/supervisord"]
+CMD ["/usr/bin/supervisord" "-c" "/etc/supervisor/supervisord.conf"]
diff --git a/packaging/docker/catlfish-dev/supervisord.conf b/packaging/docker/catlfish-dev/supervisord.conf
index 67c7b1d..8b317e0 100644
--- a/packaging/docker/catlfish-dev/supervisord.conf
+++ b/packaging/docker/catlfish-dev/supervisord.conf
@@ -2,4 +2,4 @@
 nodaemon=true
 
 [program:catlfish]
-command=/usr/local/catlfish/bin/run_erl -daemon /var/run/ /var/log/catlfish/ "exec /usr/local/catlfish/bin/erl -config catlfish"
+command=/usr/local/catlfish/bin/run_erl /var/run/catlfish/ /var/run/catlfish/erlang_log/ "exec /usr/local/catlfish/bin/erl -config catlfish"