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/swift/swift-account/Dockerfile.j2      | 2 +-
 docker/swift/swift-base/Dockerfile.j2         | 4 ++--
 docker/swift/swift-container/Dockerfile.j2    | 2 +-
 docker/swift/swift-object/Dockerfile.j2       | 2 +-
 docker/swift/swift-proxy-server/Dockerfile.j2 | 2 +-
 docker/swift/swift-rsyncd/Dockerfile.j2       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'docker/swift')

diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2
index 6fd31431f..dacde88b0 100644
--- a/docker/swift/swift-account/Dockerfile.j2
+++ b/docker/swift/swift-account/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set swift_acount_packages = ['swift-account'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(swift_acount_packages | customizable("packages")) }}
+{{ macros.install_packages(swift_acount_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 15bf9ee49..5fe04a0a2 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set swift_base_packages = ['swift'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(swift_base_packages | customizable("packages")) }}
+{{ macros.install_packages(swift_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
@@ -19,7 +19,7 @@ RUN {{ macros.install_packages(swift_base_packages | customizable("packages")) }
         {% set swift_base_packages = ['liberasurecode-dev'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(swift_base_packages | customizable("packages")) }}
+{{ macros.install_packages(swift_base_packages | customizable("packages")) }}
 ADD swift-base-archive /swift-base-source
 RUN ln -s swift-base-source/* swift \
     && useradd --user-group swift \
diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2
index cbce0c2bd..c59cac0e9 100644
--- a/docker/swift/swift-container/Dockerfile.j2
+++ b/docker/swift/swift-container/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set swift_container_packages = ['swift-container'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(swift_container_packages | customizable("packages")) }}
+{{ macros.install_packages(swift_container_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2
index e169f4de0..d575af047 100644
--- a/docker/swift/swift-object/Dockerfile.j2
+++ b/docker/swift/swift-object/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set swift_object_packages = ['swift-object'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(swift_object_packages | customizable("packages")) }}
+{{ macros.install_packages(swift_object_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index 6ba07b902..54895ff65 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set swift_proxy_server_packages = ['swift-proxy'] %}
     {% endif %}
 
-RUN {{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }}
+{{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2
index 74864edef..b85a7a492 100644
--- a/docker/swift/swift-rsyncd/Dockerfile.j2
+++ b/docker/swift/swift-rsyncd/Dockerfile.j2
@@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
     {% set swift_rsyncd_packages = ['rsync'] %}
 {% endif %}
 
-RUN {{ macros.install_packages(swift_rsyncd_packages | customizable("packages")) }}
+{{ macros.install_packages(swift_rsyncd_packages | customizable("packages")) }}
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
-- 
cgit v1.2.3