diff options
| author | Steven Dake <stdake@cisco.com> | 2015-09-17 09:35:33 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-09-28 03:16:48 -0700 |
| commit | 0e99b69de48c1deb7f6f1f707e78f445caa5c3d0 (patch) | |
| tree | b83ec74aef4059cd3d4a93ce59113a80df6aae65 /docker/heat | |
| parent | d813f53b956daee77a1530abf2a9a54442785f06 (diff) | |
| download | kolla-0e99b69de48c1deb7f6f1f707e78f445caa5c3d0.tar.gz kolla-0e99b69de48c1deb7f6f1f707e78f445caa5c3d0.zip | |
Implement a install_type and install_metatype
This prepares for the RHEL OSP implementation by making the build
tool convert all binary-* into an install_type of binary and * into
an install_metatype variable substitution inside the Dockerfiles.
Further binary-* is substituted as install_name to enable proper
building only.
Change-Id: Ib681b29176eb79a3cab12ec824313fdecb6e7a5f
Partially-Implements: blueprint rhel-based-image-support
Diffstat (limited to 'docker/heat')
| -rw-r--r-- | docker/heat/heat-api-cfn/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/heat/heat-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/heat/heat-engine/Dockerfile.j2 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 7e8701eda..7b4cb7d68 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 48bbda15d..19eb89777 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 0bbf3a53c..00ca07f3b 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 495d2b375..3759788d1 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} |