Merge branch 'staging'

Dockerfile

@@ -1,16 +1,14 @@
-FROM ubuntu:trusty
+FROM tutum/curl:trusty
 MAINTAINER Israel Gayoso [email protected] 
 
-# Update the APT cache, add basho's repository and install packages
-RUN sed -i.bak 's/main$/main universe/' /etc/apt/sources.list
-RUN apt-get update && \
-  apt-get install -y apt-transport-https openssl pwgen
+RUN curl https://packagecloud.io/gpg.key | apt-key add -
+RUN apt-get update
+RUN apt-get install -y apt-transport-https supervisor openssl pwgen
+RUN echo "deb https://packagecloud.io/basho/riak/ubuntu/ trusty main" >> /etc/apt/sources.list.d/basho.list
+RUN echo "deb-src https://packagecloud.io/basho/riak/ubuntu/ trusty main" >> /etc/apt/sources.list.d/basho.list
 
-# Add riak's repository and install
-ADD ./basho.apt.key /tmp/basho.apt.key
-RUN apt-key add /tmp/basho.apt.key && rm /tmp/basho.apt.key
-RUN echo "deb https://packagecloud.io/basho/riak/ubuntu/ trusty main" > /etc/apt/sources.list.d/basho.list
-RUN apt-get update && apt-get install riak
+RUN apt-get update
+RUN apt-get install -y riak
 
 # Riak's config 
 ENV RIAK_NODE_NAME "127.0.0.1"
@@ -22,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