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/openstack-base | |
| 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/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 9b5809786..300adbec7 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }} 'openssl' ] %} -RUN {{ macros.install_packages(openstack_base_packages) }} +{{ macros.install_packages(openstack_base_packages) }} {% endif %} {% if install_type == 'binary' %} @@ -185,7 +185,7 @@ ENV DEBIAN_FRONTEND noninteractive ] %} {% endif %} -RUN {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} +{{ macros.install_packages(openstack_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} @@ -221,7 +221,7 @@ RUN {{ macros.install_packages(openstack_base_packages | customizable("packages" ] %} {% endif %} -RUN {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} +{{ macros.install_packages(openstack_base_packages | customizable("packages")) }} ADD openstack-base-archive /openstack-base-source RUN ln -s openstack-base-source/* /requirements \ && mkdir -p /var/lib/kolla \ |