diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2017-06-29 14:36:42 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2017-06-29 14:36:42 +0100 |
| commit | b5aca933d6c108472490cbe0c3584f7c6aa211e4 (patch) | |
| tree | be345325baa59569b1ac59d6976678854a4c1b32 /docker | |
| parent | c2c457c28201f551d9bc401f562c17ba2ac6eb36 (diff) | |
| download | kolla-b5aca933d6c108472490cbe0c3584f7c6aa211e4.tar.gz kolla-b5aca933d6c108472490cbe0c3584f7c6aa211e4.zip | |
rabbitmq-plugins enable no longer needs /bin/true
It's unclear why this was needed originally but rabbitmq builds fine
without it.
Change-Id: I604af090b727c50e00af4273fd92ee5b6954393a
Diffstat (limited to 'docker')
| -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 %} |