openstack/kolla-ansible
Code Issues Proposed changes

Merge "Implement customizations for heat-api-cfn container"

Browse Source
This commit is contained in:
Jenkins 2016-08-03 21:18:16 +00:00 committed by Gerrit Code Review
commit f4a9667767
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker/heat/heat-api-cfn/Dockerfile.j2
View File

@ -1,22 +1,19 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set heat_api_cfn_packages = ['openstack-heat-api-cfn'] %}
RUN yum -y install \
openstack-heat-api-cfn \
&& yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set heat_api_cfn_packages = ['heat-api-cfn'] %}
RUN apt-get -y install --no-install-recommends \
heat-api-cfn \
&& apt-get clean
{% endif %} {% endif %}
RUN {{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% block heat_api_cfn_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER heat USER heat