openstack/kolla
Code Issues Proposed changes

rabbitmq-plugins enable no longer needs /bin/true

Browse Source 
It's unclear why this was needed originally but rabbitmq builds fine
without it.

Change-Id: I604af090b727c50e00af4273fd92ee5b6954393a
This commit is contained in:
Paul Bourke 2017-06-29 14:36:42 +01:00
parent c2c457c282
commit b5aca933d6
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/rabbitmq/Dockerfile.j2
View File

@ -30,17 +30,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block rabbitmq_install_plugins %} {% block rabbitmq_install_plugins %}
# NOTE(sdake): the /bin/true unblocks the rabbitmq-plugins tool. Not sure how
# or why. My suspicion is it sends a signal to the parent
# process.
RUN rm -rf /var/lib/rabbitmq/* \ RUN rm -rf /var/lib/rabbitmq/* \
&& ln -s /usr/lib/rabbitmq/lib/rabbitmq_server-3.6.* /usr/lib/rabbitmq/lib/rabbitmq_server-3.6 \ && ln -s /usr/lib/rabbitmq/lib/rabbitmq_server-3.6.* /usr/lib/rabbitmq/lib/rabbitmq_server-3.6 \
&& curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.6/plugins/rabbitmq_clusterer-3.6.x-667f92b0.ez http://www.rabbitmq.com/community-plugins/v3.6.x/rabbitmq_clusterer-3.6.x-667f92b0.ez \ && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.6/plugins/rabbitmq_clusterer-3.6.x-667f92b0.ez http://www.rabbitmq.com/community-plugins/v3.6.x/rabbitmq_clusterer-3.6.x-667f92b0.ez \
&& /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \ && /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \
rabbitmq_management \ rabbitmq_management \
rabbitmq_clusterer \ rabbitmq_clusterer
&& /bin/true
{% endblock %} {% endblock %}