diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-09-07 18:15:01 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-09-13 16:53:31 +0100 |
| commit | b41247c6569974d8b8591070076845e652d684ba (patch) | |
| tree | 88a13a896d3888e71b8e43b84165076d74ee266f /docker/congress | |
| parent | 7db277b1459effca5e8b3a13090d7b08639346cc (diff) | |
| download | kolla-b41247c6569974d8b8591070076845e652d684ba.tar.gz kolla-b41247c6569974d8b8591070076845e652d684ba.zip | |
Add header blocks to all Dockerfiles
Change needed to add header blocks to all Dockerfiles, similar to the
base.
Use case is to easily run something before packages are installed, e.g.
to COPY a local rpm in that can be added to the package list.
Change-Id: I1bbfdf0b762da0a392aa8bf47781315b45377bee
Closes-Bug: 1618969
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 }} |