From a9d08726f5a48eef77c04ea1acefc00d93ce7076 Mon Sep 17 00:00:00 2001 From: Shaun Smekel 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 Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446 --- docker/glance/glance-base/Dockerfile.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/glance') diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index 7e7f9fb7d..e645ae53d 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }} ] %} {% endif %} -RUN {{ macros.install_packages(glance_base_packages | customizable("packages")) }} +{{ macros.install_packages(glance_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} {% set glance_base_packages = [ @@ -26,7 +26,7 @@ RUN {{ macros.install_packages(glance_base_packages | customizable("packages")) 'python-rados' ] %} -RUN {{ macros.install_packages(glance_base_packages | customizable("packages")) }} +{{ macros.install_packages(glance_base_packages | customizable("packages")) }} ADD glance-base-archive /glance-base-source RUN ln -s glance-base-source/* glance \ -- cgit v1.2.3