diff options
| author | Shaun Smekel <shaun.smekel@theorem.net.au> | 2016-08-12 08:24:11 +1000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-08-19 10:49:03 +0000 |
| commit | a9d08726f5a48eef77c04ea1acefc00d93ce7076 (patch) | |
| tree | 73762d7fd4f9b95cba8fbefe273de9a9db8eabb7 /docker/keystone | |
| parent | 0b7e853784c2c0db115b0e72a3f7fc58c86c7660 (diff) | |
| download | kolla-a9d08726f5a48eef77c04ea1acefc00d93ce7076.tar.gz kolla-a9d08726f5a48eef77c04ea1acefc00d93ce7076.zip | |
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
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
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 %} |