From ac3d7c492eb74edebdb2b4ebde81ccb97563491c Mon Sep 17 00:00:00 2001 From: Artur Zarzycki Date: Mon, 28 Dec 2015 17:39:33 +0100 Subject: [PATCH] Heat ubuntu binary container Change-Id: Iae54825c48da6b22bc83331918f5734f9821ea03 Partially-Implements: blueprint binary-ubuntu --- docker/heat/heat-api-cfn/Dockerfile.j2 | 6 ++++++ docker/heat/heat-api/Dockerfile.j2 | 6 ++++++ docker/heat/heat-base/Dockerfile.j2 | 6 ++++++ docker/heat/heat-engine/Dockerfile.j2 | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 0f257a1681..68d8f80cfc 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -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 %} diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 08fa9c7f8d..358f44fdd6 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -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 %} diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 7bdfb14836..8897cce840 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -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' %} diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 7844eb565e..9ec1167c99 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -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 %}