diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-07 22:20:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-07 22:20:10 +0000 |
| commit | 732f22435837391499e6627843b43c33faeb92d9 (patch) | |
| tree | c5bf3f3c0e8cd87a59110ca687c5e6b8731d3850 | |
| parent | b00b75cae17aabd02d83becdcc3c1de701631126 (diff) | |
| parent | 6edaffbc3b2487fd4e1ce06f5d6cc5ca607cba95 (diff) | |
| download | kolla-732f22435837391499e6627843b43c33faeb92d9.tar.gz kolla-732f22435837391499e6627843b43c33faeb92d9.zip | |
Merge "Updated base image in Dockerfile and changed CMD to reference correct file"
| -rw-r--r-- | docker/rabbitmq/Dockerfile | 4 | ||||
| -rwxr-xr-x | docker/rabbitmq/init-rabbitmq.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile index 41806587c..32b1c71ae 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 36e6e266a..be69af7d5 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 |