diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-30 17:30:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-30 17:30:32 +0000 |
| commit | d126870c5c01516352451e799a0fa31e550376c0 (patch) | |
| tree | d4f5373f5bf2b5b7a05b6ba4e1ebd145c43de99c | |
| parent | 2c0ff76835acf6f74fbc4e6cd3a32bfabef9e600 (diff) | |
| parent | b5aca933d6c108472490cbe0c3584f7c6aa211e4 (diff) | |
| download | kolla-d126870c5c01516352451e799a0fa31e550376c0.tar.gz kolla-d126870c5c01516352451e799a0fa31e550376c0.zip | |
Merge "rabbitmq-plugins enable no longer needs /bin/true"
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 054a63a31..5380db956 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -30,17 +30,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% 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/* \ && 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 \ && /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \ rabbitmq_management \ - rabbitmq_clusterer \ - && /bin/true + rabbitmq_clusterer {% endblock %} |