openstack/kolla-ansible
Code Issues Proposed changes

Merge "Heat ubuntu binary container"

Browse Source
This commit is contained in:
Jenkins 2015-12-30 08:33:27 +00:00 committed by Gerrit Code Review
commit 64ca1ce5d9
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum -y install openstack-heat-api-cfn \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
heat-api-cfn \
&& apt-get clean
{% endif %}
{% endif %}

6
docker/heat/heat-api/Dockerfile.j2
View File

@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum -y install openstack-heat-api \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
heat-api \
&& apt-get clean
{% endif %}
{% endif %}

6
docker/heat/heat-base/Dockerfile.j2
View File

@ -8,6 +8,12 @@ RUN yum -y install \
openstack-heat-common \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
heat-common \
&& apt-get clean
{% endif %}
{% elif install_type == 'source' %}

6
docker/heat/heat-engine/Dockerfile.j2
View File

@ -12,6 +12,12 @@ RUN yum -y install \
openstack-heat-engine \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
heat-engine \
&& apt-get clean
{% endif %}
{% endif %}