Add block labels to all Dockerfiles

Change-Id: I9692dda817ef134d647247431565e1b58cf9da41

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}

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 %}

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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' %}

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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 %}