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/trove/trove-api/Dockerfile.j2         | 2 +-
 docker/trove/trove-base/Dockerfile.j2        | 2 +-
 docker/trove/trove-conductor/Dockerfile.j2   | 2 +-
 docker/trove/trove-guestagent/Dockerfile.j2  | 2 +-
 docker/trove/trove-taskmanager/Dockerfile.j2 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'docker/trove')

diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2
index ed68f053a..1a022b7f4 100644
--- a/docker/trove/trove-api/Dockerfile.j2
+++ b/docker/trove/trove-api/Dockerfile.j2
@@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
         {% set trove_api_packages = ['trove-api'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(trove_api_packages | customizable("packages")) }}
+{{ macros.install_packages(trove_api_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2
index 40a427f9b..86521191f 100644
--- a/docker/trove/trove-base/Dockerfile.j2
+++ b/docker/trove/trove-base/Dockerfile.j2
@@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
         {% set trove_base_packages = ['trove-common'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(trove_base_packages | customizable("packages")) }}
+{{ macros.install_packages(trove_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
 
diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2
index d1e583280..464a35023 100644
--- a/docker/trove/trove-conductor/Dockerfile.j2
+++ b/docker/trove/trove-conductor/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set trove_conductor_packages = ['trove-conductor'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(trove_conductor_packages | customizable("packages")) }}
+{{ macros.install_packages(trove_conductor_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2
index aff1af1fd..56823fb8e 100644
--- a/docker/trove/trove-guestagent/Dockerfile.j2
+++ b/docker/trove/trove-guestagent/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set trove_guestagent_packages = ['trove-guestagent'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(trove_guestagent_packages | customizable("packages")) }}
+{{ macros.install_packages(trove_guestagent_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2
index 1eb7bb785..9930f3df2 100644
--- a/docker/trove/trove-taskmanager/Dockerfile.j2
+++ b/docker/trove/trove-taskmanager/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set trove_taskmanager_packages = ['trove-taskmanager'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(trove_taskmanager_packages | customizable("packages")) }}
+{{ macros.install_packages(trove_taskmanager_packages | customizable("packages")) }}
 
 {% endif %}
 
-- 
cgit v1.2.3