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/murano/murano-api/Dockerfile.j2 | 2 +- docker/murano/murano-base/Dockerfile.j2 | 2 +- docker/murano/murano-engine/Dockerfile.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/murano') diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 9d2890597..611d3131c 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }} {% set murano_api_packages = ['murano-api'] %} {% endif %} -RUN {{ macros.install_packages(murano_api_packages | customizable("packages")) }} +{{ macros.install_packages(murano_api_packages | customizable("packages")) }} {% endif %} diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index b9fe141d1..5649cc56b 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }} {% set murano_base_packages = ['murano-common'] %} {% endif %} -RUN {{ macros.install_packages(murano_base_packages | customizable("packages")) }} +{{ macros.install_packages(murano_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index 9a2395ad5..825831e49 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }} {% set murano_engine_packages = ['murano-engine'] %} {% endif %} -RUN {{ macros.install_packages(murano_engine_packages | customizable("packages")) }} +{{ macros.install_packages(murano_engine_packages | customizable("packages")) }} {% endif %} -- cgit v1.2.3