From 6edaffbc3b2487fd4e1ce06f5d6cc5ca607cba95 Mon Sep 17 00:00:00 2001
From: James Labocki <jlabocki@redhat.com>
Date: Fri, 3 Oct 2014 14:45:33 -0400
Subject: [PATCH] Updated base image in Dockerfile and changed CMD to reference
correct file
Also, fixed up environment variable to use RABBITMQ_NODE_PORT, which is
what RabbitMQ expects (http://www.rabbitmq.com/configure.html).
Implements: blueprint kube-rabbitmq-container
Change-Id: Iacc2ea5d3c4a002e6920ed17cb21733a0cbd8d21
---
docker/rabbitmq/Dockerfile | 4 ++--
docker/rabbitmq/init-rabbitmq.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile
index 41806587c5..32b1c71ae3 100644
--- a/docker/rabbitmq/Dockerfile
+++ b/docker/rabbitmq/Dockerfile
@@ -1,8 +1,8 @@
-FROM fedora
+FROM kollaglue/fedora-rdo-base
MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
RUN yum -y install rabbitmq-server; yum clean all
ADD rabbitmq.config /etc/rabbitmq/
ADD rabbitmq-env.conf /etc/rabbitmq/
-ADD start.sh /start.sh
+ADD init-rabbitmq.sh /start.sh
CMD ["/start.sh"]
diff --git a/docker/rabbitmq/init-rabbitmq.sh b/docker/rabbitmq/init-rabbitmq.sh
index 36e6e266a7..be69af7d5c 100755
--- a/docker/rabbitmq/init-rabbitmq.sh
+++ b/docker/rabbitmq/init-rabbitmq.sh
@@ -2,7 +2,7 @@
: ${RABBITMQ_USER:=guest}
: ${RABBITMQ_PASS:=guest}
-: ${RABBITMQ_PORT:=5672}
+: ${RABBITMQ_NODE_PORT:=5672}
: ${RABBITMQ_LOG_BASE:=/var/log/rabbitmq}
sed -i '
@@ -11,7 +11,7 @@ sed -i '
' /etc/rabbitmq/rabbitmq.config
sed -i '
- s|@RABBITMQ_PORT@|'"$RABBITMQ_PORT"'|g
+ s|@RABBITMQ_PORT@|'"$RABBITMQ_NODE_PORT"'|g
s|@RABBITMQ_LOG_BASE@|'"$RABBITMQ_LOG_BASE"'|g
' /etc/rabbitmq/rabbitmq-env.conf