diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-17 18:16:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-17 18:16:16 +0000 |
| commit | d4d40b9d9f05d7e71435c66c9c69f74a1ab79288 (patch) | |
| tree | ed209ad419e76ad8a16d6fd88bf0b3b87dbd2f12 | |
| parent | 545d4033dba7edc9e9b5718c409c90428988da5b (diff) | |
| parent | 649a2a3c9e147b835053d4a186e159092762477d (diff) | |
| download | kolla-d4d40b9d9f05d7e71435c66c9c69f74a1ab79288.tar.gz kolla-d4d40b9d9f05d7e71435c66c9c69f74a1ab79288.zip | |
Merge "Fix heat docker templates"
| -rw-r--r-- | docker_templates/heat/heat-api-cfn/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker_templates/heat/heat-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker_templates/heat/heat-engine/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker_templates/heat/heat-api-cfn/Dockerfile.j2 b/docker_templates/heat/heat-api-cfn/Dockerfile.j2 index 6bebe6227..ecff87b00 100644 --- a/docker_templates/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker_templates/heat/heat-api-cfn/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker_templates/heat/heat-api/Dockerfile.j2 b/docker_templates/heat/heat-api/Dockerfile.j2 index 49552127a..2688a3270 100644 --- a/docker_templates/heat/heat-api/Dockerfile.j2 +++ b/docker_templates/heat/heat-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker_templates/heat/heat-engine/Dockerfile.j2 b/docker_templates/heat/heat-engine/Dockerfile.j2 index 60ee1b696..d080fec6a 100644 --- a/docker_templates/heat/heat-engine/Dockerfile.j2 +++ b/docker_templates/heat/heat-engine/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} |