From 489bcd3c755102ada07ace3fd601736b55d309ce Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Tue, 26 Jul 2016 12:39:57 +0100 Subject: [PATCH] Implement customizations for heat-api-cfn container Add customizations for heat-api-cfn containers Partially-implements: blueprint third-party-plugin-support Change-Id: Ibee860cd902cbd4167e4ae20b498c4652c2ad430 Signed-off-by: Eduardo Gonzalez --- docker/heat/heat-api-cfn/Dockerfile.j2 | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 0656947344..ca5ff51029 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