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/heat | |
| 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/heat')
| -rw-r--r-- | docker/heat/heat-api-cfn/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/heat/heat-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/heat/heat-engine/Dockerfile.j2 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index ca5ff5102..501622cb6 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['ubuntu'] %} {% set heat_api_cfn_packages = ['heat-api-cfn'] %} {% endif %} -RUN {{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }} +{{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }} {% endif %} {% block heat_api_cfn_footer %}{% endblock %} diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 22cae4177..5adf39578 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['ubuntu'] %} {% set heat_api_packages = ['heat-api'] %} {% endif %} -RUN {{ macros.install_packages(heat_api_packages | customizable("packages")) }} +{{ macros.install_packages(heat_api_packages | customizable("packages")) }} {% endif %} COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 23287ee09..9faae2ab3 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['ubuntu'] %} {% set heat_base_packages = ['heat-common'] %} {% endif %} -RUN {{ macros.install_packages(heat_base_packages | customizable("packages")) }} +{{ macros.install_packages(heat_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index e0d5ede54..8f9ed23f7 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }} {% elif base_distro in ['ubuntu'] %} {% set heat_engine_packages = ['heat-engine'] %} {% endif %} -RUN {{ macros.install_packages(heat_engine_packages | customizable("packages")) }} +{{ macros.install_packages(heat_engine_packages | customizable("packages")) }} {% endif %} {% block heat_engine_footer %}{% endblock %} |