From a9d08726f5a48eef77c04ea1acefc00d93ce7076 Mon Sep 17 00:00:00 2001
From: Shaun Smekel <shaun.smekel@theorem.net.au>
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 <paul.bourke@oracle.com>
Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb
Closes-bug: 1612446
---
 docker/heat/heat-api-cfn/Dockerfile.j2 | 2 +-
 docker/heat/heat-api/Dockerfile.j2     | 2 +-
 docker/heat/heat-base/Dockerfile.j2    | 2 +-
 docker/heat/heat-engine/Dockerfile.j2  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'docker/heat')

diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index ca5ff5102..501622cb6 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/Dockerfile.j2
@@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
     {% elif base_distro in ['ubuntu'] %}
         {% set heat_api_cfn_packages = ['heat-api-cfn'] %}
     {% endif %}
-RUN {{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }}
+{{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }}
 {% endif %}
 
 {% block heat_api_cfn_footer %}{% endblock %}
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 22cae4177..5adf39578 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
     {% elif base_distro in ['ubuntu'] %}
         {% set heat_api_packages = ['heat-api'] %}
     {% endif %}
-RUN {{ macros.install_packages(heat_api_packages | customizable("packages")) }}
+{{ macros.install_packages(heat_api_packages | customizable("packages")) }}
 {% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index 23287ee09..9faae2ab3 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
 {% elif base_distro in ['ubuntu'] %}
     {% set heat_base_packages = ['heat-common'] %}
 {% endif %}
-RUN {{ macros.install_packages(heat_base_packages | customizable("packages")) }}
+{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
 
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2
index e0d5ede54..8f9ed23f7 100644
--- a/docker/heat/heat-engine/Dockerfile.j2
+++ b/docker/heat/heat-engine/Dockerfile.j2
@@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
     {% elif base_distro in ['ubuntu'] %}
         {% set heat_engine_packages = ['heat-engine'] %}
     {% endif %}
-RUN {{ macros.install_packages(heat_engine_packages | customizable("packages")) }}
+{{ macros.install_packages(heat_engine_packages | customizable("packages")) }}
 
 {% endif %}
 {% block heat_engine_footer %}{% endblock %}
-- 
cgit v1.2.3