summaryrefslogtreecommitdiff
path: root/packaging/docker/catlfish-merge/supervisord.conf
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-04-01 22:14:13 +0200
committerLinus Nordberg <linus@nordberg.se>2015-04-03 16:48:59 +0200
commit352ade3dfb4890c40f17ebff2cfc55c21e8de20e (patch)
treecf5b10685c93a6c6471eda3e55e40d5b7ea60885 /packaging/docker/catlfish-merge/supervisord.conf
parent4860fff216892010a997547b0fa19cd4505cb804 (diff)
[Docker] Add docker support for merge nodes.
Also, run as a separate user in docker-dev.
Diffstat (limited to 'packaging/docker/catlfish-merge/supervisord.conf')
-rw-r--r--packaging/docker/catlfish-merge/supervisord.conf6
1 files changed, 6 insertions, 0 deletions
diff --git a/packaging/docker/catlfish-merge/supervisord.conf b/packaging/docker/catlfish-merge/supervisord.conf
new file mode 100644
index 0000000..deaf308
--- /dev/null
+++ b/packaging/docker/catlfish-merge/supervisord.conf
@@ -0,0 +1,6 @@
+[supervisord]
+nodaemon=true
+
+[program:catlfish-merge]
+childlogdir=/var/run/catlfish
+command=/usr/local/catlfish/bin/merge.sh 300 1200 /var/local/db/catlfish-merge