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/keystone/Dockerfile.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docker/keystone')

diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2
index 15088bd7d..d499dbbaf 100644
--- a/docker/keystone/Dockerfile.j2
+++ b/docker/keystone/Dockerfile.j2
@@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
             'python-ldappool'
         ] %}
 
-RUN {{ macros.install_packages(keystone_packages | customizable("packages")) }}
+{{ macros.install_packages(keystone_packages | customizable("packages")) }}
 RUN mkdir -p /var/www/cgi-bin/keystone \
     && cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/main \
     && cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin \
@@ -28,7 +28,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
             'python-ldappool'
         ] %}
 
-RUN {{ macros.install_packages(keystone_packages | customizable("packages")) }}
+{{ macros.install_packages(keystone_packages | customizable("packages")) }}
 RUN mkdir -p /var/www/cgi-bin/keystone \
     && cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main \
     && cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin \
@@ -43,7 +43,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
             'mod_wsgi',
             'python-ldappool'
         ] %}
-RUN {{ macros.install_packages(keystone_packages | customizable("packages")) }}
+{{ macros.install_packages(keystone_packages | customizable("packages")) }}
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
 
     {% elif base_distro in ['ubuntu', 'debian'] %}
@@ -53,7 +53,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
             'libapache2-mod-wsgi',
             'python-ldappool'
         ] %}
-RUN {{ macros.install_packages(keystone_packages | customizable("packages")) }}
+{{ macros.install_packages(keystone_packages | customizable("packages")) }}
 RUN echo > /etc/apache2/ports.conf
 
     {% endif %}
-- 
cgit v1.2.3