aboutsummaryrefslogtreecommitdiff
path: root/docker/rabbitmq
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-15 02:35:46 +0000
committerGerrit Code Review <review@openstack.org>2016-03-15 02:35:47 +0000
commit439188cedbae289897d9d392681096928023258d (patch)
tree1966449921ee239ea740e4b631acc7cf3265267f /docker/rabbitmq
parent302b0302166ddfec43608e34bbcfaff6ce0c4545 (diff)
parent8b3f0d085712154d580e4a464ca7e88e612f2fb2 (diff)
downloadkolla-439188cedbae289897d9d392681096928023258d.tar.gz
kolla-439188cedbae289897d9d392681096928023258d.zip
Merge "Use ubuntu Mitaka repo"
Diffstat (limited to 'docker/rabbitmq')
-rw-r--r--docker/rabbitmq/Dockerfile.j219
1 files changed, 9 insertions, 10 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index 75f5d488b..b9c967b9a 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -5,24 +5,23 @@ MAINTAINER {{ maintainer }}
RUN yum -y install \
hostname \
- 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/* \
- && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.5/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez http://www.rabbitmq.com/community-plugins/v3.5.x/rabbitmq_clusterer-3.5.x-189b3a81.ez
+ https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_7/rabbitmq-server-3.5.7-1.noarch.rpm \
+ && yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
-RUN apt-get install -y --no-install-recommends rabbitmq-server \
- && apt-get clean \
- && rm -rf /var/lib/rabbitmq/* \
- && curl -o /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.4/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez http://www.rabbitmq.com/community-plugins/v3.5.x/rabbitmq_clusterer-3.5.x-189b3a81.ez
+RUN apt-get install -y --no-install-recommends \
+ rabbitmq-server \
+ && apt-get clean
{% endif %}
# 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 /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \
+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 \
+ && /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \
rabbitmq_management \
rabbitmq_clusterer \
&& /bin/true
@@ -36,4 +35,4 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
{{ include_footer }}
-USER rabbitmq \ No newline at end of file
+USER rabbitmq