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/congress | |
| 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/congress')
| -rw-r--r-- | docker/congress/congress-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/congress/congress-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/congress/congress-datasource/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/congress/congress-policy-engine/Dockerfile.j2 | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/docker/congress/congress-api/Dockerfile.j2 b/docker/congress/congress-api/Dockerfile.j2 index b23548746..4a47d6b94 100644 --- a/docker/congress/congress-api/Dockerfile.j2 +++ b/docker/congress/congress-api/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block congress_api_header %}{% endblock %} + COPY extend_start.sh /usr/local/bin/kolla_congress_extend_start RUN chmod 755 /usr/local/bin/kolla_congress_extend_start diff --git a/docker/congress/congress-base/Dockerfile.j2 b/docker/congress/congress-base/Dockerfile.j2 index a7a19f82c..7a399fe0b 100644 --- a/docker/congress/congress-base/Dockerfile.j2 +++ b/docker/congress/congress-base/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix}}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block congress_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/congress/congress-datasource/Dockerfile.j2 b/docker/congress/congress-datasource/Dockerfile.j2 index 5a62891ec..f807ddb69 100644 --- a/docker/congress/congress-datasource/Dockerfile.j2 +++ b/docker/congress/congress-datasource/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block congress_datasource_header %}{% endblock %} + {% block congress_datasource_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} diff --git a/docker/congress/congress-policy-engine/Dockerfile.j2 b/docker/congress/congress-policy-engine/Dockerfile.j2 index 6a1a6d056..88de85571 100644 --- a/docker/congress/congress-policy-engine/Dockerfile.j2 +++ b/docker/congress/congress-policy-engine/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block congress_policy_engine_header %}{% endblock %} + {% block congress_policy_engine_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} |