Merge branch 'master' of github.com:basho-labs/riak-docker

Author: jbrisbin

README.adoc

@@ -151,7 +151,7 @@ RUN mkdir -p /etc/riak/schemas
 
 WORKDIR /var/lib/riak
 
-CMD $RIAK_HOME/riak-cluster.sh
+CMD ["$RIAK_HOME/riak-cluster.sh"]
 
 # Clean up APT cache
 RUN rm -rf /var/lib/apt/lists/* /tmp/*

riak-cluster.sh

@@ -34,7 +34,7 @@ export COORDINATOR_NODE=${COORDINATOR_NODE:-$HOSTNAME}
 export COORDINATOR_NODE_HOST=$(ping -c1 $COORDINATOR_NODE | awk '/^PING/ {print $3}' | sed 's/[()]//g')||'127.0.0.1'
 
 # Run all prestart scripts
-PRESTART=$(find /etc/riak/prestart.d -name *.sh -print)
+PRESTART=$(find /etc/riak/prestart.d -name *.sh -print | sort)
 for s in $PRESTART; do
   . $s
 done
@@ -44,10 +44,13 @@ $RIAK start
 $RIAK_ADMIN wait-for-service riak_kv
 
 # Run all poststart scripts
-POSTSTART=$(find /etc/riak/poststart.d -name *.sh -print)
+POSTSTART=$(find /etc/riak/poststart.d -name *.sh -print | sort)
 for s in $POSTSTART; do
-  . $s
+  . $
 done
 
-# Tail the log file indefinitely
-tail -n 1024 -f /var/log/riak/console.log
+# Trap SIGTERM and SIGINT and tail the log file indefinitely
+tail -n 1024 -f /var/log/riak/console.log &
+PID=$!
+trap "$RIAK stop; kill $PID" SIGTERM SIGINT
+wait $PID