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

6 files changed, 9 insertions, 9 deletions

diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index 3d8d08259..629de733f 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -19,7 +19,7 @@ MAINTAINER {{ maintainer }}
 
     {% endif %}
 
-RUN {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
+{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2
index e187693f6..4cec33a55 100644
--- a/docker/cinder/cinder-backup/Dockerfile.j2
+++ b/docker/cinder/cinder-backup/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
                 'cinder-backup'
         ] %}
 
-RUN {{ macros.install_packages(cinder_backup_packages | customizable("packages")) }}
+{{ macros.install_packages(cinder_backup_packages | customizable("packages")) }}
 
     {% endif %}
 {% endif %}
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index e6749442e..ac9922d03 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -23,7 +23,7 @@ MAINTAINER {{ maintainer }}
 
     {% endif %}
 
-RUN {{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
+{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
@@ -44,7 +44,7 @@ RUN {{ macros.install_packages(cinder_base_packages | customizable("packages"))
 
     {% endif %}
 
-RUN {{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
+{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
 
 ADD cinder-base-archive /cinder-base-source
 RUN ln -s cinder-base-source/* cinder \
diff --git a/docker/cinder/cinder-rpcbind/Dockerfile.j2 b/docker/cinder/cinder-rpcbind/Dockerfile.j2
index eede97c8e..3a9c1b53a 100644
--- a/docker/cinder/cinder-rpcbind/Dockerfile.j2
+++ b/docker/cinder/cinder-rpcbind/Dockerfile.j2
@@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }}
 
 {% endif %}
 
-RUN {{ macros.install_packages(cinder_rpcbind_packages | customizable("packages")) }}
+{{ macros.install_packages(cinder_rpcbind_packages | customizable("packages")) }}
 
 {% block cinder_rpcbind_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2
index aa5345684..9233d09ca 100644
--- a/docker/cinder/cinder-scheduler/Dockerfile.j2
+++ b/docker/cinder/cinder-scheduler/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
                 'cinder-scheduler'
         ] %}
 
-RUN {{ macros.install_packages(cinder_scheduler_packages | customizable("packages")) }}
+{{ macros.install_packages(cinder_scheduler_packages | customizable("packages")) }}
 
     {% endif %}
 {% endif %}
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index 8cb7e28b5..329ef49b4 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
             'scsi-target-utils'
     ] %}
 
-RUN {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
+{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
 
 {% block cinder_volume_redhat_setup %}
 RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
@@ -21,7 +21,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
             'tgt'
     ] %}
 
-RUN {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
+{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
 
 {% block cinder_volume_ubuntu_setup %}
 RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
@@ -36,7 +36,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
                 'cinder-volume'
         ] %}
 
-RUN {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
+{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
 
     {% endif %}
 {% endif %}