From 802b118bfaa730c85681b33767a00e448dc26f6d Mon Sep 17 00:00:00 2001
From: Michal Rostecki <michal.rostecki@allegrogroup.com>
Date: Thu, 9 Jul 2015 18:07:44 +0200
Subject: Add RabbitMQ image for Ubuntu

Dockerfile for RabbitMQ server installed from Ubuntu
Cloud Archive.

Partially implements: blueprint install-from-ubuntu

Change-Id: Ie90cbc4bea943b81b966d7b391b4de6df2e68364
---
 docker/common/rabbitmq/config-rabbit.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docker/common')

diff --git a/docker/common/rabbitmq/config-rabbit.sh b/docker/common/rabbitmq/config-rabbit.sh
index 750b253a4..29cd1bb06 100644
--- a/docker/common/rabbitmq/config-rabbit.sh
+++ b/docker/common/rabbitmq/config-rabbit.sh
@@ -44,7 +44,8 @@ function configure_rabbit {
     elif [ "$RABBITMQ_SERVICE_HOST" ]; then
         # work around:
         # https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/653405
-        echo "${RABBITMQ_SERVICE_HOST} `/usr/bin/hostname -s`" > /etc/hosts
+        HOSTNAME=`/usr/bin/hostname -s 2> /dev/null || /bin/hostname 2> /dev/null`
+        echo "${RABBITMQ_SERVICE_HOST} ${HOSTNAME}" > /etc/hosts
     else
         echo "You need RABBITMQ_SERVICE_HOST or RABBITMQ_CLUSTER_NODES & " \
             " RABBITMQ_CLUSTER_COOKIES variables"
-- 
cgit v1.2.3