diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2020-02-19 22:39:33 +0100 |
|---|---|---|
| committer | Christian Berendt <berendt@betacloud-solutions.de> | 2020-03-01 17:25:58 +0000 |
| commit | 861f55fbfd7558d56008e6275b0c6f5993346b95 (patch) | |
| tree | 437d4aea63cc00510b9f9a8ff256b522eed5f6ca | |
| parent | fecd325c67fb7700d86f682be57c1ef456ed7707 (diff) | |
| download | kolla-861f55fbfd7558d56008e6275b0c6f5993346b95.tar.gz kolla-861f55fbfd7558d56008e6275b0c6f5993346b95.zip | |
Add block labels to all Dockerfiles
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
273 files changed, 549 insertions, 0 deletions
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 01ac126ad..13f08f53a 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block aodh_api_header %}{% endblock %} diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index 900225e7f..23c1b4608 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block aodh_base_header %}{% endblock %} diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index 3e06be46a..7420c96ab 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/docker/aodh/aodh-evaluator/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block aodh_evaluator_header %}{% endblock %} diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index 6b1d8400d..278f3ab0e 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/docker/aodh/aodh-expirer/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block aodh_expirer_header %}{% endblock %} diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index fef7b81ce..2cc890b68 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/docker/aodh/aodh-listener/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block aodh_listener_header %}{% endblock %} diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index 7ecdb64f5..14cd1550c 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/docker/aodh/aodh-notifier/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block aodh_notifier_header %}{% endblock %} diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2 index a2bc60e46..5f6bd8fb4 100644 --- a/docker/barbican/barbican-api/Dockerfile.j2 +++ b/docker/barbican/barbican-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block barbican_api_header %}{% endblock %} diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index 0cf9821c9..ff10d53ad 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/docker/barbican/barbican-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block barbican_base_header %}{% endblock %} diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/docker/barbican/barbican-keystone-listener/Dockerfile.j2 index 11eeb41fc..632fe00c4 100644 --- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 +++ b/docker/barbican/barbican-keystone-listener/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block barbican_keystone_listener_header %}{% endblock %} diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/docker/barbican/barbican-worker/Dockerfile.j2 index 3d5cc148e..8595e54cc 100644 --- a/docker/barbican/barbican-worker/Dockerfile.j2 +++ b/docker/barbican/barbican-worker/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block barbican_worker_header %}{% endblock %} diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 15898af61..ef5c16105 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ base_image }}:{{ base_distro_tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block base_lang %} # NOTE(yoctozepto): use a UTF-8 (Unicode) locale like standard image installs do diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index effd996c2..9efeef674 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block bifrost_base_header %}{% endblock %} diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/docker/bifrost/bifrost-deploy/Dockerfile.j2 index b066b92f6..9b0b818d6 100644 --- a/docker/bifrost/bifrost-deploy/Dockerfile.j2 +++ b/docker/bifrost/bifrost-deploy/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}bifrost-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block bifrost_deploy_header %}{% endblock %} diff --git a/docker/blazar/blazar-api/Dockerfile.j2 b/docker/blazar/blazar-api/Dockerfile.j2 index 9ad121407..35b191f45 100644 --- a/docker/blazar/blazar-api/Dockerfile.j2 +++ b/docker/blazar/blazar-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}blazar-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block blazar_api_header %}{% endblock %} diff --git a/docker/blazar/blazar-base/Dockerfile.j2 b/docker/blazar/blazar-base/Dockerfile.j2 index a77050fe1..d2bddd4dc 100644 --- a/docker/blazar/blazar-base/Dockerfile.j2 +++ b/docker/blazar/blazar-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block blazar_base_header %}{% endblock %} diff --git a/docker/blazar/blazar-manager/Dockerfile.j2 b/docker/blazar/blazar-manager/Dockerfile.j2 index 01aca3d82..e3f0e55f4 100644 --- a/docker/blazar/blazar-manager/Dockerfile.j2 +++ b/docker/blazar/blazar-manager/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}blazar-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block blazar_manager_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 10c838215..331a9d203 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ceilometer_base_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index f0341ad88..e0f20d253 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ceilometer_central_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index bd0aa4c6b..ec6239803 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ceilometer_compute_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 index e67e320c0..2614b5c33 100644 --- a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ceilometer_ipmi_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 86fad1abf..b4b4be5f2 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ceilometer_notification_header %}{% endblock %} diff --git a/docker/certmonger/Dockerfile.j2 b/docker/certmonger/Dockerfile.j2 index 4b5833a20..dcd44f546 100644 --- a/docker/certmonger/Dockerfile.j2 +++ b/docker/certmonger/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block certmonger_header %}{% endblock %} diff --git a/docker/chrony/Dockerfile.j2 b/docker/chrony/Dockerfile.j2 index c510332e6..d43a5d1d6 100644 --- a/docker/chrony/Dockerfile.j2 +++ b/docker/chrony/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block chrony_header %}{% endblock %} diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 84f3a1423..7fd822ae7 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cinder_api_header %}{% endblock %} diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 5e88f6a7d..743852a25 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cinder_backup_header %}{% endblock %} diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 964cfd325..6e852f95d 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cinder_base_header %}{% endblock %} diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index ca96ccb71..8e01bafdc 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cinder_scheduler_header %}{% endblock %} diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index a5f3af756..3e9dba3d1 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cinder_volume_header %}{% endblock %} diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index cc662773d..951b424f4 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cloudkitty_api_header %}{% endblock %} diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 index 86c56e243..52da92deb 100644 --- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cloudkitty_base_header %}{% endblock %} diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 index 91ec9ad82..3eb066f6b 100644 --- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cloudkitty_processor_header %}{% endblock %} diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index 327602d69..14d09b98d 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block collectd_header %}{% endblock %} diff --git a/docker/congress/congress-api/Dockerfile.j2 b/docker/congress/congress-api/Dockerfile.j2 index 8341dfd57..9581cc602 100644 --- a/docker/congress/congress-api/Dockerfile.j2 +++ b/docker/congress/congress-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block congress_api_header %}{% endblock %} diff --git a/docker/congress/congress-base/Dockerfile.j2 b/docker/congress/congress-base/Dockerfile.j2 index a86ab796c..ee1ca0f4c 100644 --- a/docker/congress/congress-base/Dockerfile.j2 +++ b/docker/congress/congress-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix}}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block congress_base_header %}{% endblock %} diff --git a/docker/congress/congress-datasource/Dockerfile.j2 b/docker/congress/congress-datasource/Dockerfile.j2 index 799cbeadb..3cb903727 100644 --- a/docker/congress/congress-datasource/Dockerfile.j2 +++ b/docker/congress/congress-datasource/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block congress_datasource_header %}{% endblock %} diff --git a/docker/congress/congress-policy-engine/Dockerfile.j2 b/docker/congress/congress-policy-engine/Dockerfile.j2 index b5cf7e613..9e0fe5cf2 100644 --- a/docker/congress/congress-policy-engine/Dockerfile.j2 +++ b/docker/congress/congress-policy-engine/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block congress_policy_engine_header %}{% endblock %} diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2 index 83c395b73..a97d99427 100644 --- a/docker/cron/Dockerfile.j2 +++ b/docker/cron/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cron_header %}{% endblock %} diff --git a/docker/cyborg/cyborg-agent/Dockerfile.j2 b/docker/cyborg/cyborg-agent/Dockerfile.j2 index edd67e2b9..97e3790dd 100644 --- a/docker/cyborg/cyborg-agent/Dockerfile.j2 +++ b/docker/cyborg/cyborg-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cyborg_agent_header %}{% endblock %} {% import "macros.j2" as macros with context %} diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index 8e82f7179..71081f875 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cyborg_api_header %}{% endblock %} {% import "macros.j2" as macros with context %} diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 index 7e411b535..36b0aa007 100644 --- a/docker/cyborg/cyborg-base/Dockerfile.j2 +++ b/docker/cyborg/cyborg-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cyborg_header %}{% endblock %} diff --git a/docker/cyborg/cyborg-conductor/Dockerfile.j2 b/docker/cyborg/cyborg-conductor/Dockerfile.j2 index de0211bda..51e562ca0 100644 --- a/docker/cyborg/cyborg-conductor/Dockerfile.j2 +++ b/docker/cyborg/cyborg-conductor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cyborg_conductor_header %}{% endblock %} diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index d138d4887..38b726aec 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block designate_api_header %}{% endblock %} diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index 27e5ccdc3..6f4362ecb 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block designate_backend_bind9_header %}{% endblock %} diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index 12825cd3e..c87e30e31 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block designate_base_header %}{% endblock %} diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index 6fab7b7fc..e8f3addbd 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block designate_central_header %}{% endblock %} diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index 3a7133de4..13c22bf6f 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block designate_mdns_header %}{% endblock %} diff --git a/docker/designate/designate-producer/Dockerfile.j2 b/docker/designate/designate-producer/Dockerfile.j2 index 21a60aea2..2c08c6b53 100644 --- a/docker/designate/designate-producer/Dockerfile.j2 +++ b/docker/designate/designate-producer/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block designate_producer_header %}{% endblock %} diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 4383dbbd3..88fb5bda2 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block designate_sink_header %}{% endblock %} diff --git a/docker/designate/designate-worker/Dockerfile.j2 b/docker/designate/designate-worker/Dockerfile.j2 index 23af7a6d0..05432b37f 100644 --- a/docker/designate/designate-worker/Dockerfile.j2 +++ b/docker/designate/designate-worker/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block designate_worker_header %}{% endblock %} diff --git a/docker/dnsmasq/Dockerfile.j2 b/docker/dnsmasq/Dockerfile.j2 index 0fc5cad87..d7de0680f 100644 --- a/docker/dnsmasq/Dockerfile.j2 +++ b/docker/dnsmasq/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block dnsmasq_header %}{% endblock %} diff --git a/docker/ec2-api/Dockerfile.j2 b/docker/ec2-api/Dockerfile.j2 index fd8a1d560..a6c9ee569 100644 --- a/docker/ec2-api/Dockerfile.j2 +++ b/docker/ec2-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ec2_api_header %}{% endblock %} diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 index 7497163bc..0463fca02 100644 --- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block elasticsearch_curator_header %}{% endblock %} diff --git a/docker/elasticsearch/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/elasticsearch/Dockerfile.j2 index e4b6ae4de..2bab2d8dc 100644 --- a/docker/elasticsearch/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block elasticsearch_header %}{% endblock %} diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2 index 423fa82a3..956f80352 100644 --- a/docker/etcd/Dockerfile.j2 +++ b/docker/etcd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block etcd_header %}{% endblock %} diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 5091efae6..cc082fd7a 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% if base_package_type == 'rpm' and base_arch != 'x86_64' %} LABEL fluentd_version="0.12" fluentd_binary="fluentd" {% set fluentd_user = 'fluentd' %} diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2 index fa06784cd..702d8719f 100644 --- a/docker/freezer/freezer-api/Dockerfile.j2 +++ b/docker/freezer/freezer-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}freezer-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block freezer_api_header %}{% endblock %} diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2 index b1787651d..5022a7c4a 100644 --- a/docker/freezer/freezer-base/Dockerfile.j2 +++ b/docker/freezer/freezer-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block freezer_base_header %}{% endblock %} diff --git a/docker/freezer/freezer-scheduler/Dockerfile.j2 b/docker/freezer/freezer-scheduler/Dockerfile.j2 index 2d86f8a3c..77138e9f0 100644 --- a/docker/freezer/freezer-scheduler/Dockerfile.j2 +++ b/docker/freezer/freezer-scheduler/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}freezer-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block freezer_scheduler_header %}{% endblock %} diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 1b98f1efe..cd61b5fd4 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block glance_api_header %}{% endblock %} diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index 466047a71..37020c7a3 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block glance_base_header %}{% endblock %} diff --git a/docker/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2 index d03ba54cd..e44ff3d69 100644 --- a/docker/glance/glance-registry/Dockerfile.j2 +++ b/docker/glance/glance-registry/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block glance_registry_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index 535831cff..9d87bac6a 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block gnocchi_api_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 5ef69800e..2348b7c5b 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block gnocchi_base_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 index 5fda3852e..4e188654f 100644 --- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block gnocchi_metricd_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 index 434d37d4c..ba641fe3b 100644 --- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block gnocchi_statsd_header %}{% endblock %} diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index df1863f8b..e62dc91c8 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block grafana_header %}{% endblock %} diff --git a/docker/hacluster/hacluster-base/Dockerfile.j2 b/docker/hacluster/hacluster-base/Dockerfile.j2 index 7997e1229..26fc3fd70 100644 --- a/docker/hacluster/hacluster-base/Dockerfile.j2 +++ b/docker/hacluster/hacluster-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block hacluster_base_header %}{% endblock %} diff --git a/docker/hacluster/hacluster-corosync/Dockerfile.j2 b/docker/hacluster/hacluster-corosync/Dockerfile.j2 index 08f3f678f..0544fb370 100644 --- a/docker/hacluster/hacluster-corosync/Dockerfile.j2 +++ b/docker/hacluster/hacluster-corosync/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block hacluster_corosync_header %}{% endblock %} diff --git a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 b/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 index 2a6570ffe..0295bc391 100644 --- a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block hacluster_pacemaker_remote_header %}{% endblock %} diff --git a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 b/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 index a11163a3c..d69a7ebc3 100644 --- a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block hacluster_pacemaker_header %}{% endblock %} diff --git a/docker/hacluster/hacluster-pcs/Dockerfile.j2 b/docker/hacluster/hacluster-pcs/Dockerfile.j2 index 081a026f4..bb7d92a6c 100644 --- a/docker/hacluster/hacluster-pcs/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pcs/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block hacluster_pcs_header %}{% endblock %} diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index 19ddeeb56..6625912f6 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block haproxy_header %}{% endblock %} diff --git a/docker/heat/heat-all/Dockerfile.j2 b/docker/heat/heat-all/Dockerfile.j2 index b73956cea..e7ccb67a1 100644 --- a/docker/heat/heat-all/Dockerfile.j2 +++ b/docker/heat/heat-all/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block heat_all_header %}{% endblock %} diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 5f25ab074..cede0ca7b 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block heat_api_cfn_header %}{% endblock %} diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 6b1529d6e..42462eaf7 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block heat_api_header %}{% endblock %} diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 167a45c91..bd8cfb661 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block heat_base_header %}{% endblock %} diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 524bf2fc3..fcb958109 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block heat_engine_header %}{% endblock %} diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 5ce5e7f72..c9474d5e9 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block horizon_header %}{% endblock %} diff --git a/docker/influxdb/Dockerfile.j2 b/docker/influxdb/Dockerfile.j2 index 51d3f5b03..1b817f2ad 100644 --- a/docker/influxdb/Dockerfile.j2 +++ b/docker/influxdb/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block influxdb_header %}{% endblock %} diff --git a/docker/ironic-inspector/Dockerfile.j2 b/docker/ironic-inspector/Dockerfile.j2 index 3332bf93e..5d08f3b9f 100644 --- a/docker/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic-inspector/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ironic_inspector_header %}{% endblock %} diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 7ca61ee4a..35bde0c7a 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ironic_api_header %}{% endblock %} diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index fac6acbc8..5ed1defd0 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ironic_base_header %}{% endblock %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 39d0957ac..e8592e36d 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ironic_conductor_header %}{% endblock %} diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index 5cc675657..1a778fa23 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ironic_pxe_header %}{% endblock %} diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index 22e800ce8..49bccd576 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block iscsid_header %}{% endblock %} diff --git a/docker/kafka/Dockerfile.j2 b/docker/kafka/Dockerfile.j2 index 090339167..38f8fb472 100644 --- a/docker/kafka/Dockerfile.j2 +++ b/docker/kafka/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block kafka_header %}{% endblock %} diff --git a/docker/karbor/karbor-api/Dockerfile.j2 b/docker/karbor/karbor-api/Dockerfile.j2 index a8b457fd3..32b084f88 100644 --- a/docker/karbor/karbor-api/Dockerfile.j2 +++ b/docker/karbor/karbor-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block karbor_api_header %}{% endblock %} diff --git a/docker/karbor/karbor-base/Dockerfile.j2 b/docker/karbor/karbor-base/Dockerfile.j2 index 4093a6e4e..bb8c3eff3 100644 --- a/docker/karbor/karbor-base/Dockerfile.j2 +++ b/docker/karbor/karbor-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block karbor_base_header %}{% endblock %} diff --git a/docker/karbor/karbor-operationengine/Dockerfile.j2 b/docker/karbor/karbor-operationengine/Dockerfile.j2 index fc798a04f..dbb95f57b 100644 --- a/docker/karbor/karbor-operationengine/Dockerfile.j2 +++ b/docker/karbor/karbor-operationengine/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block karbor_operationengine_header %}{% endblock %} diff --git a/docker/karbor/karbor-protection/Dockerfile.j2 b/docker/karbor/karbor-protection/Dockerfile.j2 index 4940846f9..827b77abf 100644 --- a/docker/karbor/karbor-protection/Dockerfile.j2 +++ b/docker/karbor/karbor-protection/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block karbor_protection_header %}{% endblock %} diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index 620526a0d..c2db99fe2 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block keepalived_header %}{% endblock %} diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 85d0734eb..6792ff3c5 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block keystone_base_header %}{% endblock %} diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2 index 07baba979..702e064a9 100644 --- a/docker/keystone/keystone-fernet/Dockerfile.j2 +++ b/docker/keystone/keystone-fernet/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block keystone_fernet_header %}{% endblock %} diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 442f2df9d..cfda95319 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block keystone_ssh_header %}{% endblock %} diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 62a92dcb9..95096f59d 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block keystone_header %}{% endblock %} diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index 4845958c0..2b1421f4e 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block kibana_header %}{% endblock %} diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index db42d8786..c826f0692 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block kolla_toolbox_header %}{% endblock %} diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 index a7ed3bc09..bc5cb7571 100644 --- a/docker/kuryr/kuryr-base/Dockerfile.j2 +++ b/docker/kuryr/kuryr-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block kuryr_base_header %}{% endblock %} diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 index c5a63be02..4bab327a9 100644 --- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 +++ b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}kuryr-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block kuryr_libnetwork_header %}{% endblock %} diff --git a/docker/logstash/Dockerfile.j2 b/docker/logstash/Dockerfile.j2 index 9652e8ab6..66a77296b 100644 --- a/docker/logstash/Dockerfile.j2 +++ b/docker/logstash/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block logstash_header %}{% endblock %} diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index 2a7f78cce..1bc75758e 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block magnum_api_header %}{% endblock %} diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index 063db926e..14024b6ac 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block magnum_base_header %}{% endblock %} diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 5f065008c..39178fccf 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block magnum_conductor_header %}{% endblock %} diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index 1176e6247..d16ee8f91 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block manila_api_header %}{% endblock %} diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index 42bb189ab..85f2f2c17 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block manila_base_header %}{% endblock %} diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index 33ac19aab..1c988186a 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block manila_data_header %}{% endblock %} diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2 index 4757075f6..b2330ecb6 100644 --- a/docker/manila/manila-scheduler/Dockerfile.j2 +++ b/docker/manila/manila-scheduler/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block manila_scheduler_header %}{% endblock %} diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index 2dc599b09..f3e016eff 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block manila_share_header %}{% endblock %} diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index fffa48426..b100b9471 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block mariadb_header %}{% endblock %} diff --git a/docker/masakari/masakari-api/Dockerfile.j2 b/docker/masakari/masakari-api/Dockerfile.j2 index 28b836e1c..f8391ef5a 100644 --- a/docker/masakari/masakari-api/Dockerfile.j2 +++ b/docker/masakari/masakari-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}masakari-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block masakari_api_header %}{% endblock %} diff --git a/docker/masakari/masakari-base/Dockerfile.j2 b/docker/masakari/masakari-base/Dockerfile.j2 index 65b944e6f..42170f565 100644 --- a/docker/masakari/masakari-base/Dockerfile.j2 +++ b/docker/masakari/masakari-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block masakari_base_header %}{% endblock %} diff --git a/docker/masakari/masakari-engine/Dockerfile.j2 b/docker/masakari/masakari-engine/Dockerfile.j2 index 4de51bcf6..ba9e95bc3 100644 --- a/docker/masakari/masakari-engine/Dockerfile.j2 +++ b/docker/masakari/masakari-engine/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}masakari-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block masakari_engine_header %}{% endblock %} diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2 index 2039b556a..b0856d1dd 100644 --- a/docker/masakari/masakari-monitors/Dockerfile.j2 +++ b/docker/masakari/masakari-monitors/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}masakari-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block masakari_monitors_header %}{% endblock %} diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index 2d81d366b..2995fecd5 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block memcached_header %}{% endblock %} diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index bcd4530f9..05ea55f64 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block mistral_api_header %}{% endblock %} diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2 index 8bfbb25c8..22bcd647c 100644 --- a/docker/mistral/mistral-base/Dockerfile.j2 +++ b/docker/mistral/mistral-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block mistral_base_header %}{% endblock %} diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2 index 498c6dd30..76b8990d5 100644 --- a/docker/mistral/mistral-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-engine/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block mistral_engine_header %}{% endblock %} diff --git a/docker/mistral/mistral-event-engine/Dockerfile.j2 b/docker/mistral/mistral-event-engine/Dockerfile.j2 index 33dce0bfb..92a720dd4 100644 --- a/docker/mistral/mistral-event-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-event-engine/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block mistral_event_engine_header %}{% endblock %} diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2 index 4180ed284..8d6571ed7 100644 --- a/docker/mistral/mistral-executor/Dockerfile.j2 +++ b/docker/mistral/mistral-executor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block mistral_executor_header %}{% endblock %} diff --git a/docker/monasca/monasca-agent/Dockerfile.j2 b/docker/monasca/monasca-agent/Dockerfile.j2 index b56982a02..24a7f6c96 100644 --- a/docker/monasca/monasca-agent/Dockerfile.j2 +++ b/docker/monasca/monasca-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block monasca_agent_header %}{% endblock %} diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2 index 97c96d95b..e8337fae1 100644 --- a/docker/monasca/monasca-api/Dockerfile.j2 +++ b/docker/monasca/monasca-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block monasca_api_header %}{% endblock %} diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2 index aa62f5ee3..fbe6da457 100644 --- a/docker/monasca/monasca-base/Dockerfile.j2 +++ b/docker/monasca/monasca-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block monasca_base_header %}{% endblock %} diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index c296b8b59..e04bb2bb8 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block monasca_grafana_header %}{% endblock %} diff --git a/docker/monasca/monasca-log-api/Dockerfile.j2 b/docker/monasca/monasca-log-api/Dockerfile.j2 index 94d49408d..696a3f666 100644 --- a/docker/monasca/monasca-log-api/Dockerfile.j2 +++ b/docker/monasca/monasca-log-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block monasca_log_api_header %}{% endblock %} diff --git a/docker/monasca/monasca-notification/Dockerfile.j2 b/docker/monasca/monasca-notification/Dockerfile.j2 index 1e01101c4..e5bf0ea58 100644 --- a/docker/monasca/monasca-notification/Dockerfile.j2 +++ b/docker/monasca/monasca-notification/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block monasca_notification_header %}{% endblock %} diff --git a/docker/monasca/monasca-persister/Dockerfile.j2 b/docker/monasca/monasca-persister/Dockerfile.j2 index 75c272134..a075ca8f4 100644 --- a/docker/monasca/monasca-persister/Dockerfile.j2 +++ b/docker/monasca/monasca-persister/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block monasca_persister_header %}{% endblock %} diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index f76ef50e0..3622f5be5 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}storm:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} USER root diff --git a/docker/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2 index b6d7985c5..73ff37444 100644 --- a/docker/mongodb/Dockerfile.j2 +++ b/docker/mongodb/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block mongodb_header %}{% endblock %} diff --git a/docker/multipathd/Dockerfile.j2 b/docker/multipathd/Dockerfile.j2 index 0618930e5..0b0baf21a 100644 --- a/docker/multipathd/Dockerfile.j2 +++ b/docker/multipathd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block multipathd_header %}{% endblock %} diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 42323e7c3..8b7062c31 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block murano_api_header %}{% endblock %} diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 4be44f9bf..246301621 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block murano_base_header %}{% endblock %} diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index 67a19d6e7..73bd95717 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block murano_engine_header %}{% endblock %} diff --git a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 index 179e41b09..07006d86c 100644 --- a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 +++ b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ironic_neutron_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 76649730e..846ac9301 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_base_header %}{% endblock %} diff --git a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 index c750625c8..7cb7cbfd9 100644 --- a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 +++ b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_bgp_dragent_header %}{% endblock %} diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 index 9a298baf3..82d2b9484 100644 --- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_dhcp_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 b/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 index bc7dd9764..f8fee5d83 100644 --- a/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_infoblox_ipam_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2 index 0e9bdcd00..c7859a1a8 100644 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_l3_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 514e88f3e..5fe9cb630 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_linuxbridge_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 index edfcc73d5..f3aea0b4e 100644 --- a/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_metadata_agent_ovn_header %}{% endblock %} diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index ef7e9453b..96e2fddd4 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_metadata_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2 index 84a9dc276..e4950a084 100644 --- a/docker/neutron/neutron-metering-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metering-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_metering_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 index 0158bba01..7a957b584 100644 --- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_mlnx_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index c62dce2f6..1d41177e8 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_openvswitch_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 index 287274a5e..5c6055dce 100644 --- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 +++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} USER root diff --git a/docker/neutron/neutron-server-ovn/Dockerfile.j2 b/docker/neutron/neutron-server-ovn/Dockerfile.j2 index 6e2b10cb0..9720dc48e 100644 --- a/docker/neutron/neutron-server-ovn/Dockerfile.j2 +++ b/docker/neutron/neutron-server-ovn/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} USER root diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 8a27a98b5..e41520088 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_server_header %}{% endblock %} diff --git a/docker/neutron/neutron-sriov-agent/Dockerfile.j2 b/docker/neutron/neutron-sriov-agent/Dockerfile.j2 index f60c2754b..6660296e3 100644 --- a/docker/neutron/neutron-sriov-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-sriov-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block neutron_sriov_agent_header %}{% endblock %} diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 848782004..c4e9fe1ee 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_api_header %}{% endblock %} diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index b3ec434b1..7ba84f479 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_base_header %}{% endblock %} diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index cf2d6738c..b978e2399 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_compute_ironic_header %}{% endblock %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 36083fe4e..d95f2f2b6 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_compute_header %}{% endblock %} diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index 01cb2f4b8..092f809d0 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_conductor_header %}{% endblock %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 8a90776ea..080085678 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_libvirt_header %}{% endblock %} diff --git a/docker/nova/nova-mksproxy/Dockerfile.j2 b/docker/nova/nova-mksproxy/Dockerfile.j2 index f03359340..e4b7b729b 100644 --- a/docker/nova/nova-mksproxy/Dockerfile.j2 +++ b/docker/nova/nova-mksproxy/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_mksproxy_header %}{% endblock %} diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index b87c350f6..71e7ac37f 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_novncproxy_header %}{% endblock %} diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index 0933e48d3..303b3a728 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_scheduler_header %}{% endblock %} diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2 index e3aa198be..a22514b17 100644 --- a/docker/nova/nova-serialproxy/Dockerfile.j2 +++ b/docker/nova/nova-serialproxy/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_serialproxy_header %}{% endblock %} diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index fce71702e..9016ebe77 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_spicehtml5proxy_header %}{% endblock %} diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index 3d0ebd04d..b66b587ab 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block nova_ssh_header %}{% endblock %} diff --git a/docker/novajoin/novajoin-base/Dockerfile.j2 b/docker/novajoin/novajoin-base/Dockerfile.j2 index 6c382574a..aba307a96 100644 --- a/docker/novajoin/novajoin-base/Dockerfile.j2 +++ b/docker/novajoin/novajoin-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block novajoin_base_header %}{% endblock %} diff --git a/docker/novajoin/novajoin-notifier/Dockerfile.j2 b/docker/novajoin/novajoin-notifier/Dockerfile.j2 index e459a7fe1..29852a8de 100644 --- a/docker/novajoin/novajoin-notifier/Dockerfile.j2 +++ b/docker/novajoin/novajoin-notifier/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}novajoin-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block novajoin_notifier_header %}{% endblock %} diff --git a/docker/novajoin/novajoin-server/Dockerfile.j2 b/docker/novajoin/novajoin-server/Dockerfile.j2 index 4ffd66577..5dd000ce6 100644 --- a/docker/novajoin/novajoin-server/Dockerfile.j2 +++ b/docker/novajoin/novajoin-server/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}novajoin-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block novajoin_server_header %}{% endblock %} diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/docker/octavia/octavia-api/Dockerfile.j2 index 78f696450..7d8bec19a 100644 --- a/docker/octavia/octavia-api/Dockerfile.j2 +++ b/docker/octavia/octavia-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block octavia_api_header %}{% endblock %} diff --git a/docker/octavia/octavia-base/Dockerfile.j2 b/docker/octavia/octavia-base/Dockerfile.j2 index 526965f51..8ae291f1e 100644 --- a/docker/octavia/octavia-base/Dockerfile.j2 +++ b/docker/octavia/octavia-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block octavia_base_header %}{% endblock %} diff --git a/docker/octavia/octavia-health-manager/Dockerfile.j2 b/docker/octavia/octavia-health-manager/Dockerfile.j2 index 6983f793c..57a0868e2 100644 --- a/docker/octavia/octavia-health-manager/Dockerfile.j2 +++ b/docker/octavia/octavia-health-manager/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block octavia_health_manager_header %}{% endblock %} diff --git a/docker/octavia/octavia-housekeeping/Dockerfile.j2 b/docker/octavia/octavia-housekeeping/Dockerfile.j2 index 31688d6fe..90fefeffc 100644 --- a/docker/octavia/octavia-housekeeping/Dockerfile.j2 +++ b/docker/octavia/octavia-housekeeping/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block octavia_housekeeping_header %}{% endblock %} diff --git a/docker/octavia/octavia-worker/Dockerfile.j2 b/docker/octavia/octavia-worker/Dockerfile.j2 index 40db1bc80..741bef1ee 100644 --- a/docker/octavia/octavia-worker/Dockerfile.j2 +++ b/docker/octavia/octavia-worker/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block octavia_worker_header %}{% endblock %} diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2 index c2ede5cbd..6616f9318 100644 --- a/docker/opendaylight/Dockerfile.j2 +++ b/docker/opendaylight/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block opendaylight_header %}{% endblock %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 0b36e26e4..d6a80f6de 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block openstack_base_header %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 2d48f8468..c98676f2c 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block openvswitch_base_header %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index d888d94f5..b82a18d20 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block openvswitch_db_server_header %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 index 197c46a9e..fdbaf3fac 100644 --- a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block openvswitch_netcontrold_header %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index a22e7e1ad..711bc99b2 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block openvswitch_vswitchd_header %}{% endblock %} diff --git a/docker/ovn/ovn-base/Dockerfile.j2 b/docker/ovn/ovn-base/Dockerfile.j2 index d0c837873..86e6ca425 100644 --- a/docker/ovn/ovn-base/Dockerfile.j2 +++ b/docker/ovn/ovn-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ovn_base_header %}{% endblock %} diff --git a/docker/ovn/ovn-controller/Dockerfile.j2 b/docker/ovn/ovn-controller/Dockerfile.j2 index 334a7f972..ef4d05ddc 100644 --- a/docker/ovn/ovn-controller/Dockerfile.j2 +++ b/docker/ovn/ovn-controller/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ovn_controller_header %}{% endblock %} diff --git a/docker/ovn/ovn-nb-db-server/Dockerfile.j2 b/docker/ovn/ovn-nb-db-server/Dockerfile.j2 index ac5be8886..ecc94651b 100644 --- a/docker/ovn/ovn-nb-db-server/Dockerfile.j2 +++ b/docker/ovn/ovn-nb-db-server/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ovn_nb_db_server_header %}{% endblock %} diff --git a/docker/ovn/ovn-northd/Dockerfile.j2 b/docker/ovn/ovn-northd/Dockerfile.j2 index a8af3f209..2c94f2f20 100644 --- a/docker/ovn/ovn-northd/Dockerfile.j2 +++ b/docker/ovn/ovn-northd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ovn_northd_header %}{% endblock %} diff --git a/docker/ovn/ovn-sb-db-server/Dockerfile.j2 b/docker/ovn/ovn-sb-db-server/Dockerfile.j2 index 2ebae7267..9acd01fa3 100644 --- a/docker/ovn/ovn-sb-db-server/Dockerfile.j2 +++ b/docker/ovn/ovn-sb-db-server/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ovn_sb_db_server_header %}{% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 index 10840f2e8..af9592272 100644 --- a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ovsdpdk:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ovsdpdk_db_header %}{% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 index 3e71d1d73..f23e0b79d 100644 --- a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ovsdpdk:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ovsdpdk_vswitchd_header %}{% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 index b22627b79..370b987a1 100644 --- a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% import "macros.j2" as macros with context %} {% block ovsdpdk_header %}{% endblock %} diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2 index 394ddc8aa..6816a400e 100644 --- a/docker/panko/panko-api/Dockerfile.j2 +++ b/docker/panko/panko-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}panko-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block panko_api_header %}{% endblock %} diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 index 0be5db429..48d90ccb4 100644 --- a/docker/panko/panko-base/Dockerfile.j2 +++ b/docker/panko/panko-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block panko_base_header %}{% endblock %} diff --git a/docker/placement/placement-api/Dockerfile.j2 b/docker/placement/placement-api/Dockerfile.j2 index 25c732014..078167736 100644 --- a/docker/placement/placement-api/Dockerfile.j2 +++ b/docker/placement/placement-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}placement-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block placement_api_header %}{% endblock %} diff --git a/docker/placement/placement-base/Dockerfile.j2 b/docker/placement/placement-base/Dockerfile.j2 index 2fc455b1e..f40aa251e 100644 --- a/docker/placement/placement-base/Dockerfile.j2 +++ b/docker/placement/placement-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block placement_base_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 index ed5cff2ae..433e8d628 100644 --- a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 +++ b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block prometheus_alertmanager_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-base/Dockerfile.j2 b/docker/prometheus/prometheus-base/Dockerfile.j2 index 8bb86e227..3dbe0d0fd 100644 --- a/docker/prometheus/prometheus-base/Dockerfile.j2 +++ b/docker/prometheus/prometheus-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block prometheus_base_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 index 90b5fa46a..4bbdaf341 100644 --- a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block prometheus_blackbox_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 index eeb87f5c4..f9dd4dcc0 100644 --- a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 +++ b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block prometheus_cadvisor_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 index 92fdcb6e7..3ce6c4a34 100644 --- a/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block prometheus_elasticsearch_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 index 82a4cff87..e73a332a8 100644 --- a/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block haproxy_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 index 3a7f885cc..d5b4d7388 100644 --- a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block prometheus_memcached_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-mtail/Dockerfile.j2 b/docker/prometheus/prometheus-mtail/Dockerfile.j2 index 28008f16d..5e6efe413 100644 --- a/docker/prometheus/prometheus-mtail/Dockerfile.j2 +++ b/docker/prometheus/prometheus-mtail/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block prometheus_mtail_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 index 10d1c6d69..1aafb379a 100644 --- a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block mysqld_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 index 22ad08125..c6e305686 100644 --- a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block node_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 index 9a5e17c94..49531b7b4 100644 --- a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block prometheus_openstack_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-server/Dockerfile.j2 b/docker/prometheus/prometheus-server/Dockerfile.j2 index b99aadbec..a8877d082 100644 --- a/docker/prometheus/prometheus-server/Dockerfile.j2 +++ b/docker/prometheus/prometheus-server/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block prometheus_server_header %}{% endblock %} diff --git a/docker/ptp/Dockerfile.j2 b/docker/ptp/Dockerfile.j2 index 474915188..f68b63133 100644 --- a/docker/ptp/Dockerfile.j2 +++ b/docker/ptp/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ptp_header %}{% endblock %} diff --git a/docker/qdrouterd/Dockerfile.j2 b/docker/qdrouterd/Dockerfile.j2 index a7885895c..0f5e43838 100644 --- a/docker/qdrouterd/Dockerfile.j2 +++ b/docker/qdrouterd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block qdrouterd_header %}{% endblock %} diff --git a/docker/qinling/qinling-api/Dockerfile.j2 b/docker/qinling/qinling-api/Dockerfile.j2 index ca7b37db7..35ef35aa0 100644 --- a/docker/qinling/qinling-api/Dockerfile.j2 +++ b/docker/qinling/qinling-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}qinling-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block qinling_api_header %}{% endblock %} diff --git a/docker/qinling/qinling-base/Dockerfile.j2 b/docker/qinling/qinling-base/Dockerfile.j2 index 0c597f218..c18c74943 100644 --- a/docker/qinling/qinling-base/Dockerfile.j2 +++ b/docker/qinling/qinling-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block qinling_base_header %}{% endblock %} diff --git a/docker/qinling/qinling-engine/Dockerfile.j2 b/docker/qinling/qinling-engine/Dockerfile.j2 index 877822e29..28031e339 100644 --- a/docker/qinling/qinling-engine/Dockerfile.j2 +++ b/docker/qinling/qinling-engine/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}qinling-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block qinling_engine_header %}{% endblock %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index c954675e8..493f4c2f7 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block rabbitmq_header %}{% endblock %} diff --git a/docker/radvd/Dockerfile.j2 b/docker/radvd/Dockerfile.j2 index 2c0bb96e4..029d5aca4 100644 --- a/docker/radvd/Dockerfile.j2 +++ b/docker/radvd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block radvd_header %}{% endblock %} diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index a192a8382..c6aa19fbf 100644 --- a/docker/rally/Dockerfile.j2 +++ b/docker/rally/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block rally_header %}{% endblock %} diff --git a/docker/redis/redis-base/Dockerfile.j2 b/docker/redis/redis-base/Dockerfile.j2 index f0fc17db8..7f758d3fb 100644 --- a/docker/redis/redis-base/Dockerfile.j2 +++ b/docker/redis/redis-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block redis_base_header %}{% endblock %} diff --git a/docker/redis/redis-sentinel/Dockerfile.j2 b/docker/redis/redis-sentinel/Dockerfile.j2 index 92e87db35..d98e687db 100644 --- a/docker/redis/redis-sentinel/Dockerfile.j2 +++ b/docker/redis/redis-sentinel/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block redis_sentinel_header %}{% endblock %} diff --git a/docker/redis/redis/Dockerfile.j2 b/docker/redis/redis/Dockerfile.j2 index 7bc788c9d..6843a8d55 100644 --- a/docker/redis/redis/Dockerfile.j2 +++ b/docker/redis/redis/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block redis_header %}{% endblock %} diff --git a/docker/rsyslog/rsyslog-base/Dockerfile.j2 b/docker/rsyslog/rsyslog-base/Dockerfile.j2 index 36da7ad11..8bbc518f7 100644 --- a/docker/rsyslog/rsyslog-base/Dockerfile.j2 +++ b/docker/rsyslog/rsyslog-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block rsyslog_base_header %}{% endblock %} diff --git a/docker/rsyslog/rsyslog/Dockerfile.j2 b/docker/rsyslog/rsyslog/Dockerfile.j2 index 434dc107a..a715198b3 100644 --- a/docker/rsyslog/rsyslog/Dockerfile.j2 +++ b/docker/rsyslog/rsyslog/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}rsyslog-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block rsyslog_header %}{% endblock %} diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2 index bb756383f..60c4cd149 100644 --- a/docker/sahara/sahara-api/Dockerfile.j2 +++ b/docker/sahara/sahara-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block sahara_api_header %}{% endblock %} diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2 index 69d8641e1..ee7e43c3c 100644 --- a/docker/sahara/sahara-base/Dockerfile.j2 +++ b/docker/sahara/sahara-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block sahara_base_header %}{% endblock %} diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2 index 8c68117f6..26c0562da 100644 --- a/docker/sahara/sahara-engine/Dockerfile.j2 +++ b/docker/sahara/sahara-engine/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block sahara_engine_header %}{% endblock %} diff --git a/docker/searchlight/searchlight-api/Dockerfile.j2 b/docker/searchlight/searchlight-api/Dockerfile.j2 index 2e51b8973..2ccd11e06 100644 --- a/docker/searchlight/searchlight-api/Dockerfile.j2 +++ b/docker/searchlight/searchlight-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}searchlight-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block searchlight_api_header %}{% endblock %} diff --git a/docker/searchlight/searchlight-base/Dockerfile.j2 b/docker/searchlight/searchlight-base/Dockerfile.j2 index e39821340..d53a91be1 100644 --- a/docker/searchlight/searchlight-base/Dockerfile.j2 +++ b/docker/searchlight/searchlight-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block searchlight_base_header %}{% endblock %} diff --git a/docker/searchlight/searchlight-listener/Dockerfile.j2 b/docker/searchlight/searchlight-listener/Dockerfile.j2 index 4ea74fb77..0785449d4 100644 --- a/docker/searchlight/searchlight-listener/Dockerfile.j2 +++ b/docker/searchlight/searchlight-listener/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}searchlight-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block searchlight_listener_header %}{% endblock %} diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2 index e60b77d35..49b95191c 100644 --- a/docker/senlin/senlin-api/Dockerfile.j2 +++ b/docker/senlin/senlin-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block senlin_api_header %}{% endblock %} diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2 index 303de448a..9ee4a8b53 100644 --- a/docker/senlin/senlin-base/Dockerfile.j2 +++ b/docker/senlin/senlin-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block senlin_base_header %}{% endblock %} diff --git a/docker/senlin/senlin-conductor/Dockerfile.j2 b/docker/senlin/senlin-conductor/Dockerfile.j2 index c88d622e7..61d3a4e84 100644 --- a/docker/senlin/senlin-conductor/Dockerfile.j2 +++ b/docker/senlin/senlin-conductor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block senlin_conductor_header %}{% endblock %} diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2 index 17ec88da5..8bc46f871 100644 --- a/docker/senlin/senlin-engine/Dockerfile.j2 +++ b/docker/senlin/senlin-engine/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block senlin_engine_header %}{% endblock %} diff --git a/docker/senlin/senlin-health-manager/Dockerfile.j2 b/docker/senlin/senlin-health-manager/Dockerfile.j2 index 236e4dd04..25f476180 100644 --- a/docker/senlin/senlin-health-manager/Dockerfile.j2 +++ b/docker/senlin/senlin-health-manager/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block senlin_health_manager_header %}{% endblock %} diff --git a/docker/sensu/sensu-api/Dockerfile.j2 b/docker/sensu/sensu-api/Dockerfile.j2 index f4cfdfdc6..ca124f19f 100644 --- a/docker/sensu/sensu-api/Dockerfile.j2 +++ b/docker/sensu/sensu-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}sensu-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block sensu_api_header %}{% endblock %} diff --git a/docker/sensu/sensu-base/Dockerfile.j2 b/docker/sensu/sensu-base/Dockerfile.j2 index ba595784b..9d39faa68 100644 --- a/docker/sensu/sensu-base/Dockerfile.j2 +++ b/docker/sensu/sensu-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block sensu_base_header %}{% endblock %} diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2 index f281ef45d..55fac0e90 100644 --- a/docker/sensu/sensu-client/Dockerfile.j2 +++ b/docker/sensu/sensu-client/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}sensu-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block sensu_client_header %}{% endblock %} diff --git a/docker/sensu/sensu-server/Dockerfile.j2 b/docker/sensu/sensu-server/Dockerfile.j2 index fa447fe7c..cd3a43bcd 100644 --- a/docker/sensu/sensu-server/Dockerfile.j2 +++ b/docker/sensu/sensu-server/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}sensu-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block sensu_server_header %}{% endblock %} diff --git a/docker/skydive/skydive-agent/Dockerfile.j2 b/docker/skydive/skydive-agent/Dockerfile.j2 index 364ff049a..72cf1b21f 100644 --- a/docker/skydive/skydive-agent/Dockerfile.j2 +++ b/docker/skydive/skydive-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block skydive_agent_header %}{% endblock %} diff --git a/docker/skydive/skydive-analyzer/Dockerfile.j2 b/docker/skydive/skydive-analyzer/Dockerfile.j2 index 306e42db7..de265af51 100644 --- a/docker/skydive/skydive-analyzer/Dockerfile.j2 +++ b/docker/skydive/skydive-analyzer/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block skydive_analyzer_header %}{% endblock %} diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2 index e2922d0ad..a89fbb4a5 100644 --- a/docker/skydive/skydive-base/Dockerfile.j2 +++ b/docker/skydive/skydive-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block skydive_base_header %}{% endblock %} diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2 index 0373a025f..c47460543 100644 --- a/docker/solum/solum-api/Dockerfile.j2 +++ b/docker/solum/solum-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block solum_api_header %}{% endblock %} diff --git a/docker/solum/solum-base/Dockerfile.j2 b/docker/solum/solum-base/Dockerfile.j2 index fed722d78..9a7d252ad 100644 --- a/docker/solum/solum-base/Dockerfile.j2 +++ b/docker/solum/solum-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block solum_base_header %}{% endblock %} diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2 index 7a4765a7d..28298a7d1 100644 --- a/docker/solum/solum-conductor/Dockerfile.j2 +++ b/docker/solum/solum-conductor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block solum_conductor_header %}{% endblock %} diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2 index eebb436a9..d8998572e 100644 --- a/docker/solum/solum-deployer/Dockerfile.j2 +++ b/docker/solum/solum-deployer/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block solum_deployer_header %}{% endblock %} diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2 index 9c3147049..69d02de28 100644 --- a/docker/solum/solum-worker/Dockerfile.j2 +++ b/docker/solum/solum-worker/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block solum_worker_header %}{% endblock %} diff --git a/docker/storm/Dockerfile.j2 b/docker/storm/Dockerfile.j2 index d3b3f8acf..42f03897f 100644 --- a/docker/storm/Dockerfile.j2 +++ b/docker/storm/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block storm %}{% endblock %} diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2 index dee2a1f7a..8ad7ce9f6 100644 --- a/docker/swift/swift-account/Dockerfile.j2 +++ b/docker/swift/swift-account/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block swift_account_header %}{% endblock %} diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index fbf4b3556..98940dfac 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block swift_base_header %}{% endblock %} diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2 index 645660b81..4d8532f72 100644 --- a/docker/swift/swift-container/Dockerfile.j2 +++ b/docker/swift/swift-container/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block swift_container_header %}{% endblock %} diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index bbca2617a..dac92d375 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block swift_object_expirer_header %}{% endblock %} diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2 index 8f0c5f0e0..67040e51e 100644 --- a/docker/swift/swift-object/Dockerfile.j2 +++ b/docker/swift/swift-object/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block swift_object_header %}{% endblock %} diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 3ed6b965a..b7d0f0bca 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block swift_proxy_server_header %}{% endblock %} diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2 index b4c49c85b..b46e5e4cf 100644 --- a/docker/swift/swift-rsyncd/Dockerfile.j2 +++ b/docker/swift/swift-rsyncd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block swift_rsyncd_header %}{% endblock %} diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2 index 5f3e2e1de..5e1456d8c 100644 --- a/docker/tacker/tacker-base/Dockerfile.j2 +++ b/docker/tacker/tacker-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block tacker_base_header %}{% endblock %} diff --git a/docker/tacker/tacker-conductor/Dockerfile.j2 b/docker/tacker/tacker-conductor/Dockerfile.j2 index c4cf2e78b..f540cc5d6 100644 --- a/docker/tacker/tacker-conductor/Dockerfile.j2 +++ b/docker/tacker/tacker-conductor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}tacker-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block tacker_conductor_header %}{% endblock %} diff --git a/docker/tacker/tacker-server/Dockerfile.j2 b/docker/tacker/tacker-server/Dockerfile.j2 index 79b6b52c8..dd8460ce5 100644 --- a/docker/tacker/tacker-server/Dockerfile.j2 +++ b/docker/tacker/tacker-server/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}tacker-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block tacker_server_header %}{% endblock %} diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2 index 3ca337051..a7ec9c7c7 100644 --- a/docker/telegraf/Dockerfile.j2 +++ b/docker/telegraf/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block telegraf_header %}{% endblock %} diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index a15465a2f..c6f36c39e 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block tempest_header %}{% endblock %} diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2 index a2f322247..e0e7f025b 100644 --- a/docker/tgtd/Dockerfile.j2 +++ b/docker/tgtd/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block tgtd_header %}{% endblock %} diff --git a/docker/tripleoclient/Dockerfile.j2 b/docker/tripleoclient/Dockerfile.j2 index b47eff638..09f4a58d4 100644 --- a/docker/tripleoclient/Dockerfile.j2 +++ b/docker/tripleoclient/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block tripleoclient_header %}{% endblock %} diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index ce228bef9..c6a8aed73 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block trove_api_header %}{% endblock %} diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index 0212c9674..cce401354 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block trove_base_header %}{% endblock %} diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index 78cc2f596..3eaf0ade7 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/docker/trove/trove-conductor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block trove_conductor_header %}{% endblock %} diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index 79bc577f7..6f4082641 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/docker/trove/trove-guestagent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block trove_guestagent_header %}{% endblock %} diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index dfaae12e9..23ae8c104 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/docker/trove/trove-taskmanager/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block trove_taskmanager_header %}{% endblock %} diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2 index 1c1a3a1d1..b4b006480 100644 --- a/docker/vitrage/vitrage-api/Dockerfile.j2 +++ b/docker/vitrage/vitrage-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block vitrage_api_header %}{% endblock %} diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 index a45f3cc16..bf53705c9 100644 --- a/docker/vitrage/vitrage-base/Dockerfile.j2 +++ b/docker/vitrage/vitrage-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block vitrage_base_header %}{% endblock %} diff --git a/docker/vitrage/vitrage-graph/Dockerfile.j2 b/docker/vitrage/vitrage-graph/Dockerfile.j2 index 8d92d54dd..bf2d13982 100644 --- a/docker/vitrage/vitrage-graph/Dockerfile.j2 +++ b/docker/vitrage/vitrage-graph/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block vitrage_graph_header %}{% endblock %} diff --git a/docker/vitrage/vitrage-ml/Dockerfile.j2 b/docker/vitrage/vitrage-ml/Dockerfile.j2 index bde6127da..52a4caeb2 100644 --- a/docker/vitrage/vitrage-ml/Dockerfile.j2 +++ b/docker/vitrage/vitrage-ml/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block vitrage_ml_header %}{% endblock %} diff --git a/docker/vitrage/vitrage-notifier/Dockerfile.j2 b/docker/vitrage/vitrage-notifier/Dockerfile.j2 index a7da5e74d..5f9649c40 100644 --- a/docker/vitrage/vitrage-notifier/Dockerfile.j2 +++ b/docker/vitrage/vitrage-notifier/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block vitrage_notifier_header %}{% endblock %} diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2 index c6047c7eb..fe5c6ca5c 100644 --- a/docker/vmtp/Dockerfile.j2 +++ b/docker/vmtp/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block vmtp_header %}{% endblock %} diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2 index 7df63c0ea..70e5cccbc 100644 --- a/docker/watcher/watcher-api/Dockerfile.j2 +++ b/docker/watcher/watcher-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block watcher_api_header %}{% endblock %} diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2 index 925ac2bbf..060e6733c 100644 --- a/docker/watcher/watcher-applier/Dockerfile.j2 +++ b/docker/watcher/watcher-applier/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block watcher_applier_header %}{% endblock %} diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2 index 33b1cc962..961839a55 100644 --- a/docker/watcher/watcher-base/Dockerfile.j2 +++ b/docker/watcher/watcher-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block watcher_base_header %}{% endblock %} diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2 index 29a434d7b..563890762 100644 --- a/docker/watcher/watcher-engine/Dockerfile.j2 +++ b/docker/watcher/watcher-engine/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block watcher_engine_header %}{% endblock %} diff --git a/docker/zaqar/zaqar-base/Dockerfile.j2 b/docker/zaqar/zaqar-base/Dockerfile.j2 index 71fa2d90c..47833b5ee 100644 --- a/docker/zaqar/zaqar-base/Dockerfile.j2 +++ b/docker/zaqar/zaqar-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block zaqar_base_header %}{% endblock %} diff --git a/docker/zaqar/zaqar-server/Dockerfile.j2 b/docker/zaqar/zaqar-server/Dockerfile.j2 index 0c75be754..6b607a1ec 100644 --- a/docker/zaqar/zaqar-server/Dockerfile.j2 +++ b/docker/zaqar/zaqar-server/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}zaqar-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block zaqar_server_header %}{% endblock %} diff --git a/docker/zaqar/zaqar-wsgi/Dockerfile.j2 b/docker/zaqar/zaqar-wsgi/Dockerfile.j2 index 14de1b7ff..c9640617f 100644 --- a/docker/zaqar/zaqar-wsgi/Dockerfile.j2 +++ b/docker/zaqar/zaqar-wsgi/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}zaqar-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block zaqar_wsgi_header %}{% endblock %} diff --git a/docker/zookeeper/Dockerfile.j2 b/docker/zookeeper/Dockerfile.j2 index c579f6ea0..55573ea62 100644 --- a/docker/zookeeper/Dockerfile.j2 +++ b/docker/zookeeper/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block zookeeper_header %}{% endblock %} diff --git a/docker/zun/zun-api/Dockerfile.j2 b/docker/zun/zun-api/Dockerfile.j2 index 19e73ffb0..75b278a2b 100644 --- a/docker/zun/zun-api/Dockerfile.j2 +++ b/docker/zun/zun-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block zun_api_header %}{% endblock %} diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 index cb31c9ef8..b3c4946b8 100644 --- a/docker/zun/zun-base/Dockerfile.j2 +++ b/docker/zun/zun-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block zun_base_header %}{% endblock %} diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2 index df0870435..bb96149e1 100644 --- a/docker/zun/zun-compute/Dockerfile.j2 +++ b/docker/zun/zun-compute/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block zun_compute_header %}{% endblock %} diff --git a/docker/zun/zun-wsproxy/Dockerfile.j2 b/docker/zun/zun-wsproxy/Dockerfile.j2 index 4c14c5072..3663262f7 100644 --- a/docker/zun/zun-wsproxy/Dockerfile.j2 +++ b/docker/zun/zun-wsproxy/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block zun_wsproxy_header %}{% endblock %} diff --git a/releasenotes/notes/add-block-labels-d0927a1617ab13ec.yaml b/releasenotes/notes/add-block-labels-d0927a1617ab13ec.yaml new file mode 100644 index 000000000..7adfd1fde --- /dev/null +++ b/releasenotes/notes/add-block-labels-d0927a1617ab13ec.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + With the block ``labels`` it is possible to adjust the used + labels of the built images. |