openstack/kolla-ansible
Code Issues Proposed changes

Merge "Updated base image in Dockerfile and changed CMD to reference correct file"

Browse Source
This commit is contained in:
Jenkins 2014-10-07 22:20:10 +00:00 committed by Gerrit Code Review
commit 732f224358
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/rabbitmq/Dockerfile
View File

@ -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"]

4
docker/rabbitmq/init-rabbitmq.sh
View File

@ -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