diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-12 12:56:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-12 12:56:18 +0000 |
| commit | 87b4b3c19ffd9888a061b2cd7a3cc8e88fae1989 (patch) | |
| tree | 1d84038886bf77bdd6cf8708c0a7fae90557548a /docker | |
| parent | 1e9258d10e2f977645e0954ffb07c05842f7b1b2 (diff) | |
| parent | 99f355e145bddf86f6007a6799aebc60d078e943 (diff) | |
| download | kolla-87b4b3c19ffd9888a061b2cd7a3cc8e88fae1989.tar.gz kolla-87b4b3c19ffd9888a061b2cd7a3cc8e88fae1989.zip | |
Merge "Use delorean rabbitmq"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index a0b1fe49d..d11041fb9 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -6,14 +6,17 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% set rabbitmq_packages = [ 'hostname', - 'https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_7/rabbitmq-server-3.5.7-1.noarch.rpm' + 'rabbitmq-server' ] %} {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} {% elif base_distro == 'ubuntu' %} {% set rabbitmq_packages = [ - 'rabbitmq-server' + 'erlang-nox', + 'socat', + 'logrotate', + 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.2/rabbitmq-server_3.6.2-1_all.deb' ] %} {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} @@ -21,7 +24,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro == 'debian' %} {% set rabbitmq_packages = [ 'erlang-nox', - 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.5.7/rabbitmq-server_3.5.7-1_all.deb' + 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.2/rabbitmq-server_3.6.2-1_all.deb' ] %} {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} @@ -29,15 +32,18 @@ MAINTAINER {{ maintainer }} {% endif %} {% 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/* \ - && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.7/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez http://www.rabbitmq.com/community-plugins/v3.5.x/rabbitmq_clusterer-3.5.x-189b3a81.ez \ + && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.6.2/plugins/rabbitmq_clusterer-3.6.2.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 + {% endblock %} COPY extend_start.sh /usr/local/bin/kolla_extend_start |