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/designate | |
| 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/designate')
7 files changed, 21 insertions, 0 deletions
diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index 9a69e9b28..9b6a5bf3a 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block designate_api_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index 975d82c37..b912ffacd 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block designate_backend_bind9_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index 2ae661d05..fdadee6df 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block designate_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index 858fbe723..f2caebad1 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block designate_central_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index 660184b7f..a1729826f 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block designate_mdns_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/designate/designate-pool-manager/Dockerfile.j2 b/docker/designate/designate-pool-manager/Dockerfile.j2 index 37776f477..815ceb5e8 100644 --- a/docker/designate/designate-pool-manager/Dockerfile.j2 +++ b/docker/designate/designate-pool-manager/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block designate_pool_manager_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 9d0ff85fa..3c98d64ed 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block designate_sink_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} |