From a9d08726f5a48eef77c04ea1acefc00d93ce7076 Mon Sep 17 00:00:00 2001 From: Shaun Smekel Date: Fri, 12 Aug 2016 08:24:11 +1000 Subject: Handle empty package list for install_packages Currently if the install_packages macro is run with an empty package list, it will add a yum or apt-get command with no packages listed. This bug fix aims to omit this line when no packages have been given, or, the operator wants to use the "_override" / "_remove" functionality to disable all packages being installed in a Dockerfile. Co-Authored-By: Paul Bourke Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446 --- docker/aodh/aodh-api/Dockerfile.j2 | 2 +- docker/aodh/aodh-base/Dockerfile.j2 | 2 +- docker/aodh/aodh-evaluator/Dockerfile.j2 | 2 +- docker/aodh/aodh-expirer/Dockerfile.j2 | 2 +- docker/aodh/aodh-listener/Dockerfile.j2 | 2 +- docker/aodh/aodh-notifier/Dockerfile.j2 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docker/aodh') diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 939cd3742..ccb757c5b 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/Dockerfile.j2 @@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['ubuntu'] %} {% set aodh_api_packages = ['aodh-api'] %} {% endif %} -RUN {{ macros.install_packages(aodh_api_packages | customizable("packages")) }} +{{ macros.install_packages(aodh_api_packages | customizable("packages")) }} {% endif %} COPY extend_start.sh /usr/local/bin/kolla_aodh_extend_start diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index 9ab6002cf..effbf67ba 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['ubuntu'] %} {% set aodh_base_packages = ['aodh-common'] %} {% endif %} -RUN {{ macros.install_packages(aodh_base_packages | customizable("packages")) }} +{{ macros.install_packages(aodh_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index c2c359627..f6b258f73 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/docker/aodh/aodh-evaluator/Dockerfile.j2 @@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['ubuntu'] %} {% set aodh_evaluator_packages = ['aodh-evaluator'] %} {% endif %} -RUN {{ macros.install_packages(aodh_evaluator_packages | customizable("packages")) }} +{{ macros.install_packages(aodh_evaluator_packages | customizable("packages")) }} {% endif %} {% block aodh_evaluator_footer %}{% endblock %} diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index 8c7ef8433..e893dd06b 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/docker/aodh/aodh-expirer/Dockerfile.j2 @@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['ubuntu'] %} {% set aodh_expirer_packages = ['aodh-expirer'] %} {% endif %} -RUN {{ macros.install_packages(aodh_expirer_packages | customizable("packages")) }} +{{ macros.install_packages(aodh_expirer_packages | customizable("packages")) }} {% endif %} {% block aodh_expirer_footer %}{% endblock %} diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index b3a565c69..2d2afcf9b 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/docker/aodh/aodh-listener/Dockerfile.j2 @@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['ubuntu'] %} {% set aodh_listener_packages = ['aodh-listener'] %} {% endif %} -RUN {{ macros.install_packages(aodh_listener_packages | customizable("packages")) }} +{{ macros.install_packages(aodh_listener_packages | customizable("packages")) }} {% endif %} {% block aodh_listener_footer %}{% endblock %} diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index c70ea1599..8775a3a1a 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/docker/aodh/aodh-notifier/Dockerfile.j2 @@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['ubuntu'] %} {% set aodh_notifier_packages = ['aodh-notifier'] %} {% endif %} -RUN {{ macros.install_packages(aodh_notifier_packages | customizable("packages")) }} +{{ macros.install_packages(aodh_notifier_packages | customizable("packages")) }} {% endif %} {% block aodh_notifier_footer %}{% endblock %} -- cgit v1.2.3