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/neutron | |
| 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/neutron')
10 files changed, 22 insertions, 0 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 5e9b6218e..58c946f2b 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block neutron_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 index 0f0ab4c7c..497f22002 100644 --- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block neutron_dhcp_agent_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if base_distro in ['ubuntu', 'debian'] %} diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2 index cf069f4ab..235ced6a3 100644 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block neutron_l3_agent_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 index dfda7ddd9..9b21622a8 100644 --- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block neutron_lbaas_agent_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% set neutron_lbaas_agent_packages = [ diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index c9323b536..6fcbade2f 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block neutron_linuxbridge_agent_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 748011c3f..7aeaea12c 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block neutron_metadata_agent_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if base_distro in ['ubuntu', 'debian'] %} diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2 index bed3fefe4..abc875e91 100644 --- a/docker/neutron/neutron-metering-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metering-agent/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block neutron_metering_agent_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2 index e5d2d348c..1582ea9a7 100644 --- a/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block neutron_networking_sfc_agent_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index a89534846..d5ce88eee 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block neutron_openvswitch_agent_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 07d31e83e..40016be5e 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block neutron_server_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} |
