From 352ade3dfb4890c40f17ebff2cfc55c21e8de20e Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Wed, 1 Apr 2015 22:14:13 +0200
Subject: [Docker] Add docker support for merge nodes.

Also, run as a separate user in docker-dev.
---
 packaging/docker/catlfish-merge/supervisord.conf | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packaging/docker/catlfish-merge/supervisord.conf

(limited to 'packaging/docker/catlfish-merge/supervisord.conf')

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
-- 
cgit v1.1