diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-30 08:33:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-30 08:33:27 +0000 |
| commit | 64ca1ce5d94dbb14b2aee2962e02679ba198a951 (patch) | |
| tree | 4a08db5ec5cb90de3986a02821ba46bf373c2785 /docker/heat | |
| parent | a5a5b3fd61884773a4046526be255ba24bfdc9de (diff) | |
| parent | ac3d7c492eb74edebdb2b4ebde81ccb97563491c (diff) | |
| download | kolla-64ca1ce5d94dbb14b2aee2962e02679ba198a951.tar.gz kolla-64ca1ce5d94dbb14b2aee2962e02679ba198a951.zip | |
Merge "Heat ubuntu binary container"
Diffstat (limited to 'docker/heat')
| -rw-r--r-- | docker/heat/heat-api-cfn/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/heat/heat-api/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/heat/heat-engine/Dockerfile.j2 | 6 |
4 files changed, 24 insertions, 0 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 0f257a168..68d8f80cf 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 08fa9c7f8..358f44fdd 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 ef247afec..ca818b94b 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 7844eb565..9ec1167c9 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 %} |