user spuervisor as the foreground process

Dockerfile

@@ -20,6 +20,8 @@ ADD ./run.sh /run.sh
 ADD ./set_riak_password.sh /set_riak_password.sh
 ADD ./create_certificate.sh /create_certificate.sh
 
+ADD supervisord-riak.conf /etc/supervisor/conf.d/supervisord-riak.conf
+
 # Expose protocol buffers and HTTPS
 EXPOSE 8087 8098
 

run.sh

@@ -1,18 +1,21 @@
 #!/bin/bash
 
+set -m
+
 # Generate certificate
 if [ ! -f /.certificate_created  ]; then
   /create_certificate.sh
 fi
 
 # Start riak
-/usr/sbin/riak start
-#/etc/init.d/riak start
+supervisord -n &
 
 # Generate riak user
 if [ ! -f /.riak_password_set ]; then
   /set_riak_password.sh
 fi
 
-# Atach to riak console or show log for don't stop container
-tail -f /var/log/riak/*.log
+# Print riak logs to stdout
+tail -F /var/log/riak/*.log &
+
+fg %1

supervisord-riak.conf

@@ -0,0 +1,8 @@
+[supervisord]
+nodaemon=true
+
+[program:riak]
+command=bash -c "/usr/sbin/riak console"
+numprocs=1
+autostart=true
+autorestart=true