openstack/kolla-ansible
Code Issues Proposed changes

Merge "Pin rabbitmq to 3.5.5"

Browse Source
This commit is contained in:
Jenkins 2015-10-07 05:49:57 +00:00 committed by Gerrit Code Review
commit e230c0752e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/rabbitmq/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \ RUN yum -y install \
hostname \ hostname \
rabbitmq-server \ https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_5/rabbitmq-server-3.5.5-3.noarch.rpm \
&& yum clean all \ && yum clean all \
&& rm -rf /var/lib/rabbitmq/* && rm -rf /var/lib/rabbitmq/*
@ -17,7 +17,11 @@ RUN apt-get install -y --no-install-recommends rabbitmq-server \
{% endif %} {% endif %}
RUN /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management # NOTE(sdake): the /bin/true unblocks th rabbitmq-plugins tool. Not sure how
# or why. My suspicion is it sends a signal to the parent
# process.
RUN /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline rabbitmq_management \
&& /bin/true
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start