Override image's meta info.

centos based images have wrong label info,
these changes fix own image's name and build-date.

Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c
Closes-Bug: #1680341

docker/aodh/aodh-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block aodh_api_header %}{% endblock %}
 

docker/aodh/aodh-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block aodh_base_header %}{% endblock %}
 

docker/aodh/aodh-evaluator/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block aodh_evaluator_header %}{% endblock %}
 

docker/aodh/aodh-expirer/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block aodh_expirer_header %}{% endblock %}
 

docker/aodh/aodh-listener/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block aodh_listener_header %}{% endblock %}
 

docker/aodh/aodh-notifier/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block aodh_notifier_header %}{% endblock %}
 

docker/barbican/barbican-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block barbican_api_header %}{% endblock %}
 

docker/barbican/barbican-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block barbican_base_header %}{% endblock %}
 

docker/barbican/barbican-keystone-listener/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block barbican_keystone_listener_header %}{% endblock %}
 

docker/barbican/barbican-worker/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block barbican_worker_header %}{% endblock %}
 

docker/base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ base_image }}:{{ base_distro_tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {# NOTE(SamYaple): Avoid uid/gid conflicts by creating each user/group up front. #}
 {# Specifics required such as homedir or shell are configured within the service specific image #}

docker/bifrost/bifrost-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block bifrost_base_header %}{% endblock %}
 

docker/bifrost/bifrost-deploy/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}bifrost-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block bifrost_deploy_header %}{% endblock %}
 

docker/ceilometer/ceilometer-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceilometer_api_header %}{% endblock %}
 

docker/ceilometer/ceilometer-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceilometer_base_header %}{% endblock %}
 

docker/ceilometer/ceilometer-central/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceilometer_central_header %}{% endblock %}
 

docker/ceilometer/ceilometer-collector/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceilometer_collector_header %}{% endblock %}
 

docker/ceilometer/ceilometer-compute/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceilometer_compute_header %}{% endblock %}
 

docker/ceilometer/ceilometer-notification/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceilometer_notification_header %}{% endblock %}
 

docker/ceph/ceph-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceph_base_header %}{% endblock %}
 

docker/ceph/ceph-mds/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceph_mds_header %}{% endblock %}
 

docker/ceph/ceph-mon/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceph_mon_header %}{% endblock %}
 

docker/ceph/ceph-osd/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceph_osd_header %}{% endblock %}
 

docker/ceph/ceph-rgw/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceph_rgw_header %}{% endblock %}
 

docker/ceph/cephfs-fuse/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block cephfs_fuse_header %}{% endblock %}
 

docker/chrony/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block chrony_header %}{% endblock %}
 

docker/cinder/cinder-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block cinder_api_header %}{% endblock %}
 

docker/cinder/cinder-backup/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block cinder_backup_header %}{% endblock %}
 

docker/cinder/cinder-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block cinder_base_header %}{% endblock %}
 

docker/cinder/cinder-scheduler/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block cinder_scheduler_header %}{% endblock %}
 

docker/cinder/cinder-volume/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block cinder_volume_header %}{% endblock %}
 

docker/cloudkitty/cloudkitty-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block cloudkitty_api_header %}{% endblock %}
 

docker/cloudkitty/cloudkitty-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block cloudkitty_base_header %}{% endblock %}
 

docker/cloudkitty/cloudkitty-processor/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block cloudkitty_processor_header %}{% endblock %}
 

docker/collectd/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block collectd_header %}{% endblock %}
 

docker/congress/congress-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block congress_api_header %}{% endblock %}
 

docker/congress/congress-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix}}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block congress_base_header %}{% endblock %}
 

docker/congress/congress-datasource/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block congress_datasource_header %}{% endblock %}
 

docker/congress/congress-policy-engine/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block congress_policy_engine_header %}{% endblock %}
 

docker/cron/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block cron_header %}{% endblock %}
 

docker/designate/designate-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block designate_api_header %}{% endblock %}
 

docker/designate/designate-backend-bind9/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block designate_backend_bind9_header %}{% endblock %}
 

docker/designate/designate-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block designate_base_header %}{% endblock %}
 

docker/designate/designate-central/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block designate_central_header %}{% endblock %}
 

docker/designate/designate-mdns/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block designate_mdns_header %}{% endblock %}
 

docker/designate/designate-pool-manager/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block designate_pool_manager_header %}{% endblock %}
 

docker/designate/designate-sink/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block designate_sink_header %}{% endblock %}
 

docker/designate/designate-worker/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block designate_worker_header %}{% endblock %}
 

docker/dind/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block dind_header %}{% endblock %}
 

docker/dnsmasq/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block dnsmasq_header %}{% endblock %}
 

docker/elasticsearch/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block elasticsearch_header %}{% endblock %}
 

docker/etcd/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block etcd_header %}{% endblock %}
 

docker/fluentd/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block fluentd_header %}{% endblock %}
 

docker/freezer/freezer-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}freezer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block freezer_api_header %}{% endblock %}
 

docker/freezer/freezer-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block freezer_base_header %}{% endblock %}
 

docker/glance/glance-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block glance_api_header %}{% endblock %}
 

docker/glance/glance-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block glance_base_header %}{% endblock %}
 

docker/glance/glance-registry/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block glance_registry_header %}{% endblock %}
 

docker/gnocchi/gnocchi-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block gnocchi_api_header %}{% endblock %}
 

docker/gnocchi/gnocchi-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block gnocchi_base_header %}{% endblock %}
 

docker/gnocchi/gnocchi-metricd/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block gnocchi_metricd_header %}{% endblock %}
 

docker/gnocchi/gnocchi-statsd/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block gnocchi_statsd_header %}{% endblock %}
 

docker/grafana/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block grafana_header %}{% endblock %}
 

docker/haproxy/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block haproxy_header %}{% endblock %}
 

docker/heat/heat-all/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block heat_all_header %}{% endblock %}
 

docker/heat/heat-api-cfn/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block heat_api_cfn_header %}{% endblock %}
 

docker/heat/heat-api-cloudwatch/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block heat_api_cloudwatch_header %}{% endblock %}
 

docker/heat/heat-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block heat_api_header %}{% endblock %}
 

docker/heat/heat-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block heat_base_header %}{% endblock %}
 

docker/heat/heat-engine/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block heat_engine_header %}{% endblock %}
 

docker/helm-repository/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block helm_repository_version %}
 ENV helm_version=2.3.0 \

docker/horizon/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block horizon_header %}{% endblock %}
 

docker/influxdb/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block influxdb_header %}{% endblock %}
 

docker/ironic-inspector/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ironic_inspector_header %}{% endblock %}
 

docker/ironic/ironic-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ironic_api_header %}{% endblock %}
 

docker/ironic/ironic-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ironic_base_header %}{% endblock %}
 

docker/ironic/ironic-conductor/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ironic_conductor_header %}{% endblock %}
 

docker/ironic/ironic-pxe/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ironic_pxe_header %}{% endblock %}
 

docker/iscsid/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block iscsid_header %}{% endblock %}
 

docker/kafka/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block kafka_header %}{% endblock %}
 

docker/karbor/karbor-api/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block karbor_api_header %}{% endblock %}
 

docker/karbor/karbor-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block karbor_base_header %}{% endblock %}
 

docker/karbor/karbor-operationengine/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block karbor_operationengine_header %}{% endblock %}
 

docker/karbor/karbor-protection/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block karbor_protection_header %}{% endblock %}
 

docker/keepalived/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block keepalived_header %}{% endblock %}
 

docker/keystone/keystone-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block keystone_base_header %}{% endblock %}
 

docker/keystone/keystone-fernet/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block keystone_fernet_header %}{% endblock %}
 

docker/keystone/keystone-ssh/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block keystone_ssh_header %}{% endblock %}
 

docker/keystone/keystone/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block keystone_header %}{% endblock %}
 

docker/kibana/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block kibana_header %}{% endblock %}
 

docker/kolla-toolbox/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block kolla_toolbox_header %}{% endblock %}
 

docker/kube/kube-apiserver-amd64/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 ENV KUBERNETES_COMPONENT=kube-apiserver
 

docker/kube/kube-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 ENV KUBERNETES_VERSION=v1.5.4
 

docker/kube/kube-controller-manager-amd64/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 ENV KUBERNETES_COMPONENT=kube-controller-manager
 

docker/kube/kube-discovery-amd64/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 ENV KUBERNETES_COMPONENT=kube-discovery
 

docker/kube/kube-proxy-amd64/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 ENV KUBERNETES_COMPONENT=kube-proxy
 

docker/kube/kube-scheduler-amd64/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 ENV KUBERNETES_COMPONENT=kube-scheduler
 

docker/kubernetes-entrypoint/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block kubernetes_entrypoint_header %}{% endblock %}
 

docker/kubetoolbox/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block kubetoolbox_header %}{% endblock %}
 

docker/kuryr/kuryr-base/Dockerfile.j2

@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block kuryr_base_header %}{% endblock %}