From bc7cb520500f2e33a5df9afd32512fd3eb341def Mon Sep 17 00:00:00 2001 From: Bertrand Lallau Date: Tue, 28 Mar 2017 17:34:26 +0200 Subject: Rabbitmq: refactor Dockerfile.j2 file install_packages macro is used 3 times instead of 1, we could simplify code. Change-Id: I00311e2aa3db0e53adb32a1adae85c3af2ac40fe --- docker/rabbitmq/Dockerfile.j2 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'docker') diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 4c7ff02a2..e8cf9bf28 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -14,8 +14,6 @@ MAINTAINER {{ maintainer }} 'rabbitmq-server' ] %} -{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} - {% elif base_distro == 'ubuntu' %} {% set rabbitmq_packages = [ 'erlang-nox', @@ -24,17 +22,16 @@ MAINTAINER {{ maintainer }} 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb' ] %} -{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} - {% elif base_distro == 'debian' %} {% set rabbitmq_packages = [ 'erlang-nox', 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb' ] %} +{% endif %} + {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} -{% endif %} {% endblock %} {% block rabbitmq_install_plugins %} -- cgit v1.2.3