diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-14 05:16:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-14 05:16:11 +0000 |
| commit | ba32530faca434c0ef7ca3290b9bf17825342694 (patch) | |
| tree | 2c2342f3be779a26e93023c026d93cd5fb6445f3 /docker/heat | |
| parent | ae9c246315d72f5acb724b9fa93886cc30b48cec (diff) | |
| parent | b41247c6569974d8b8591070076845e652d684ba (diff) | |
| download | kolla-ba32530faca434c0ef7ca3290b9bf17825342694.tar.gz kolla-ba32530faca434c0ef7ca3290b9bf17825342694.zip | |
Merge "Add header blocks to all Dockerfiles"
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 | 3 | ||||
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/heat/heat-engine/Dockerfile.j2 | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 501622cb6..4183ed781 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block heat_api_cfn_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 5adf39578..836f42539 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block heat_api_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index e337a0afc..9bd7f9d4f 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block heat_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 8f9ed23f7..3afe0b108 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block heat_engine_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} |