diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-03 21:18:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-03 21:18:16 +0000 |
| commit | f4a9667767467caa27f939e3fd1e2d630d31ff9b (patch) | |
| tree | f870bb773b9184c433dc2f002e46b08af0803bc1 | |
| parent | 63d448fe2e110d1ef908645cedbb2431f5ffe216 (diff) | |
| parent | 489bcd3c755102ada07ace3fd601736b55d309ce (diff) | |
| download | kolla-f4a9667767467caa27f939e3fd1e2d630d31ff9b.tar.gz kolla-f4a9667767467caa27f939e3fd1e2d630d31ff9b.zip | |
Merge "Implement customizations for heat-api-cfn container"
| -rw-r--r-- | docker/heat/heat-api-cfn/Dockerfile.j2 | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 065694734..ca5ff5102 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -1,22 +1,19 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} MAINTAINER {{ maintainer }} +{% import "macros.j2" as macros with context %} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install \ - openstack-heat-api-cfn \ - && yum clean all - + {% set heat_api_cfn_packages = ['openstack-heat-api-cfn'] %} {% elif base_distro in ['ubuntu'] %} - -RUN apt-get -y install --no-install-recommends \ - heat-api-cfn \ - && apt-get clean - + {% set heat_api_cfn_packages = ['heat-api-cfn'] %} {% endif %} +RUN {{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }} {% endif %} +{% block heat_api_cfn_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER heat |