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/magnum | |
| 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/magnum')
| -rw-r--r-- | docker/magnum/magnum-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/magnum/magnum-conductor/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index 8a4847c3a..e230b72e9 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['ubuntu'] %} {% set magnum_api_packages = ['magnum-api'] %} {% endif %} -RUN {{ macros.install_packages(magnum_api_packages | customizable("packages")) }} +{{ macros.install_packages(magnum_api_packages | customizable("packages")) }} {% endif %} COPY extend_start.sh /usr/local/bin/kolla_magnum_extend_start diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index 1e7dcb8af..7fd1211dc 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -10,7 +10,7 @@ RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/y {% elif base_distro in ['ubuntu'] %} {% set magnum_base_packages = ['magnum-common'] %} {% endif %} -RUN {{ macros.install_packages(magnum_base_packages | customizable("packages")) }} +{{ macros.install_packages(magnum_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index e6e41b2c1..3284ab461 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }} ] %} {% endif %} -RUN {{ macros.install_packages(magnum_conductor_packages | customizable("packages")) }} +{{ macros.install_packages(magnum_conductor_packages | customizable("packages")) }} # Install kubectl binary RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.2.0/bin/linux/amd64/kubectl \ |