diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-19 13:28:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-19 13:28:55 +0000 |
| commit | 24c55ff7897eec9505e48a30d73783ae76e45e29 (patch) | |
| tree | edf57e3540e73556d361d538a543b1a0d3a9d36a /docker/openstack-base/Dockerfile.j2 | |
| parent | cafe368a727d979af6e5fb88fc6c673e3dab0b72 (diff) | |
| parent | a9d08726f5a48eef77c04ea1acefc00d93ce7076 (diff) | |
| download | kolla-24c55ff7897eec9505e48a30d73783ae76e45e29.tar.gz kolla-24c55ff7897eec9505e48a30d73783ae76e45e29.zip | |
Merge "Handle empty package list for install_packages"
Diffstat (limited to 'docker/openstack-base/Dockerfile.j2')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 9b5809786..300adbec7 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }} 'openssl' ] %} -RUN {{ macros.install_packages(openstack_base_packages) }} +{{ macros.install_packages(openstack_base_packages) }} {% endif %} {% if install_type == 'binary' %} @@ -185,7 +185,7 @@ ENV DEBIAN_FRONTEND noninteractive ] %} {% endif %} -RUN {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} +{{ macros.install_packages(openstack_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} @@ -221,7 +221,7 @@ RUN {{ macros.install_packages(openstack_base_packages | customizable("packages" ] %} {% endif %} -RUN {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} +{{ macros.install_packages(openstack_base_packages | customizable("packages")) }} ADD openstack-base-archive /openstack-base-source RUN ln -s openstack-base-source/* /requirements \ && mkdir -p /var/lib/kolla \ |