diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-07 05:49:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-07 05:49:57 +0000 |
| commit | e230c0752e779f8f65a8f1f0efc7675984bb3fb0 (patch) | |
| tree | cc46e6af887b54b0d696a33d5c082cf01e692fd0 /docker | |
| parent | 43284d5616ef75c1bf6aa0d9edb92176cdd18ffb (diff) | |
| parent | c6947eeb8af81f6a04affa8fa8820d6b116bb595 (diff) | |
| download | kolla-e230c0752e779f8f65a8f1f0efc7675984bb3fb0.tar.gz kolla-e230c0752e779f8f65a8f1f0efc7675984bb3fb0.zip | |
Merge "Pin rabbitmq to 3.5.5"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 764dd7c92..5a14b0ebb 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -5,7 +5,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install \ hostname \ - rabbitmq-server \ + https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_5/rabbitmq-server-3.5.5-3.noarch.rpm \ && yum clean all \ && rm -rf /var/lib/rabbitmq/* @@ -17,7 +17,11 @@ RUN apt-get install -y --no-install-recommends rabbitmq-server \ {% endif %} -RUN /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management +# NOTE(sdake): the /bin/true unblocks th rabbitmq-plugins tool. Not sure how +# or why. My suspicion is it sends a signal to the parent +# process. +RUN /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline rabbitmq_management \ + && /bin/true COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start |