Merge "Customizations for RabbitMQ"

1 files changed, 17 insertions, 12 deletions

diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index fc3051653..5364c7c2b 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -1,26 +1,30 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% import "macros.j2" as macros with context %}
+
 {% 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'
+    ] %}
 
-RUN yum -y install \
-        hostname \
-        https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_7/rabbitmq-server-3.5.7-1.noarch.rpm \
-    && yum clean all
+{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}
 
 {% elif base_distro == 'ubuntu' %}
+    {% set rabbitmq_packages = [
+        'rabbitmq-server'
+    ] %}
 
-RUN apt-get -y install --no-install-recommends \
-        rabbitmq-server \
-    && apt-get clean
+{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}
 
 {% 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'
+    ] %}
 
-RUN apt-get -y install --no-install-recommends \
-        erlang-nox \
-    && curl -s -O http://www.rabbitmq.com/releases/rabbitmq-server/v3.5.7/rabbitmq-server_3.5.7-1_all.deb \
-    && dpkg -i --force-depends rabbitmq-server_3.5.7-1_all.deb \
-    && rm rabbitmq-server_3.5.7-1_all.deb
+{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}
 
 {% endif %}
 
@@ -42,6 +46,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/rabbitmq_get_gosp
     && chmod 440 /etc/sudoers.d/kolla_rabbitmq_sudoers \
     && usermod -a -G kolla rabbitmq
 
+{% block rabbitmq_footer %}{% endblock %}
 {{ include_footer }}
 
 USER rabbitmq