diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2018-07-20 16:34:26 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2018-09-11 17:19:33 +0100 |
| commit | 31c958db5200ef900b7259da8efc9536ced63197 (patch) | |
| tree | 485675377ce31ef9a33ddd4c4f4bc11c5ea43c43 /docker/rabbitmq | |
| parent | 3d4e284e134ece50dcea41eaed98bbaa1320f798 (diff) | |
| download | kolla-31c958db5200ef900b7259da8efc9536ced63197.tar.gz kolla-31c958db5200ef900b7259da8efc9536ced63197.zip | |
Move to the latest rabbitmq
This allows us to use the new simpler style conf format, as well as drop
the dependency on the deprecated clusterer plugin.
Depends-On: I921459f3e40b9e0d4af9497384e49aabf0abe79b
Change-Id: I75e00312b36e1678b90a42cf58d24652323eff27
Diffstat (limited to 'docker/rabbitmq')
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index b737941b6..6326f108e 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -27,7 +27,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% else %} {% set rabbitmq_packages = rabbitmq_packages + [ - 'https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb', + 'rabbitmq-server', ] %} {% endif %} @@ -51,11 +51,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block rabbitmq_install_plugins %} 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 https://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 + rabbitmq_management {% endblock %} |