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/ceilometer/ceilometer-api/Dockerfile.j2          | 2 +-
 docker/ceilometer/ceilometer-base/Dockerfile.j2         | 2 +-
 docker/ceilometer/ceilometer-central/Dockerfile.j2      | 2 +-
 docker/ceilometer/ceilometer-collector/Dockerfile.j2    | 2 +-
 docker/ceilometer/ceilometer-compute/Dockerfile.j2      | 2 +-
 docker/ceilometer/ceilometer-notification/Dockerfile.j2 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'docker/ceilometer')

diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2
index e80f3f7cf..6e65a658e 100644
--- a/docker/ceilometer/ceilometer-api/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set ceilometer_api_packages = ['ceilometer-api'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
+{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 3e105906d..8c7f8d15a 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2
@@ -17,7 +17,7 @@ MAINTAINER {{ maintainer }}
          ] %}
     {% endif %}
 
-RUN {{ macros.install_packages(ceilometer_base_packages | customizable("packages")) }}
+{{ macros.install_packages(ceilometer_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
 
diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2
index 26d443697..46bcc5540 100644
--- a/docker/ceilometer/ceilometer-central/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set ceilometer_central_packages = ['ceilometer-agent-central'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(ceilometer_central_packages | customizable("packages")) }}
+{{ macros.install_packages(ceilometer_central_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
index e5f53f55e..164ed1e76 100644
--- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set ceilometer_collector_packages = ['ceilometer-collector'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(ceilometer_collector_packages | customizable("packages")) }}
+{{ macros.install_packages(ceilometer_collector_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index 0bdd06145..d1b63ac21 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
@@ -16,7 +16,7 @@ MAINTAINER {{ maintainer }}
          ] %}
     {% endif %}
 
-RUN {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
+{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
index dabeeafa8..edf6ac2dd 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(ceilometer_notification_packages | customizable("packages")) }}
+{{ macros.install_packages(ceilometer_notification_packages | customizable("packages")) }}
 
 {% endif %}
 
-- 
cgit v1.2.3