Apply docker-entrypoint.sh output change from serkodev#3

Author: ramonsmits

cluster-entrypoint.sh

@@ -5,14 +5,12 @@ set -e
 # Get hostname from enviromant variable
 HOSTNAME=`env hostname`
 echo "Starting RabbitMQ Server For host: " $HOSTNAME
+/usr/local/bin/docker-entrypoint.sh rabbitmq-server &
+sleep 5
+rabbitmqctl wait /var/lib/rabbitmq/mnesia/rabbit\@$HOSTNAME.pid
 
-if [ -z "$JOIN_CLUSTER_HOST" ]; then
-    /usr/local/bin/docker-entrypoint.sh rabbitmq-server &
-    sleep 5
-    rabbitmqctl wait /var/lib/rabbitmq/mnesia/rabbit\@$HOSTNAME.pid
-else
-    /usr/local/bin/docker-entrypoint.sh rabbitmq-server -detached
-    sleep 5
+if [ -n "$JOIN_CLUSTER_HOST" ]; then
+    echo "Starting RabbitMQ Server For host: " $HOSTNAME
     rabbitmqctl wait /var/lib/rabbitmq/mnesia/rabbit\@$HOSTNAME.pid
     rabbitmqctl stop_app
     rabbitmqctl join_cluster rabbit@$JOIN_CLUSTER_HOST