From 8c463a47a9c988df70046f7d343af0441bf29f4d Mon Sep 17 00:00:00 2001 From: Chen Date: Tue, 18 Apr 2017 17:20:03 +0900 Subject: [PATCH] Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2 Use LABEL instruction instead of MAINTAINER (deprecated) instruc- tion as suggested by Docker's official dockerfile guide. docs.docker.com/engine/reference/builder/#maintainer-deprecated Closes-Bug: #1683652 Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898 --- docker/aodh/aodh-api/Dockerfile.j2 | 2 +- docker/aodh/aodh-base/Dockerfile.j2 | 2 +- docker/aodh/aodh-evaluator/Dockerfile.j2 | 2 +- docker/aodh/aodh-expirer/Dockerfile.j2 | 2 +- docker/aodh/aodh-listener/Dockerfile.j2 | 2 +- docker/aodh/aodh-notifier/Dockerfile.j2 | 2 +- docker/barbican/barbican-api/Dockerfile.j2 | 2 +- docker/barbican/barbican-base/Dockerfile.j2 | 2 +- docker/barbican/barbican-keystone-listener/Dockerfile.j2 | 2 +- docker/barbican/barbican-worker/Dockerfile.j2 | 2 +- docker/base/Dockerfile.j2 | 2 +- docker/bifrost/bifrost-base/Dockerfile.j2 | 2 +- docker/bifrost/bifrost-deploy/Dockerfile.j2 | 2 +- docker/ceilometer/ceilometer-api/Dockerfile.j2 | 2 +- docker/ceilometer/ceilometer-base/Dockerfile.j2 | 2 +- docker/ceilometer/ceilometer-central/Dockerfile.j2 | 2 +- docker/ceilometer/ceilometer-collector/Dockerfile.j2 | 2 +- docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 2 +- docker/ceilometer/ceilometer-notification/Dockerfile.j2 | 2 +- docker/ceph/ceph-base/Dockerfile.j2 | 2 +- docker/ceph/ceph-mds/Dockerfile.j2 | 2 +- docker/ceph/ceph-mon/Dockerfile.j2 | 2 +- docker/ceph/ceph-osd/Dockerfile.j2 | 2 +- docker/ceph/ceph-rgw/Dockerfile.j2 | 2 +- docker/ceph/cephfs-fuse/Dockerfile.j2 | 2 +- docker/chrony/Dockerfile.j2 | 2 +- docker/cinder/cinder-api/Dockerfile.j2 | 2 +- docker/cinder/cinder-backup/Dockerfile.j2 | 2 +- docker/cinder/cinder-base/Dockerfile.j2 | 2 +- docker/cinder/cinder-scheduler/Dockerfile.j2 | 2 +- docker/cinder/cinder-volume/Dockerfile.j2 | 2 +- docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 2 +- docker/cloudkitty/cloudkitty-base/Dockerfile.j2 | 2 +- docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 | 2 +- docker/collectd/Dockerfile.j2 | 2 +- docker/congress/congress-api/Dockerfile.j2 | 2 +- docker/congress/congress-base/Dockerfile.j2 | 2 +- docker/congress/congress-datasource/Dockerfile.j2 | 2 +- docker/congress/congress-policy-engine/Dockerfile.j2 | 2 +- docker/cron/Dockerfile.j2 | 2 +- docker/designate/designate-api/Dockerfile.j2 | 2 +- docker/designate/designate-backend-bind9/Dockerfile.j2 | 2 +- docker/designate/designate-base/Dockerfile.j2 | 2 +- docker/designate/designate-central/Dockerfile.j2 | 2 +- docker/designate/designate-mdns/Dockerfile.j2 | 2 +- docker/designate/designate-pool-manager/Dockerfile.j2 | 2 +- docker/designate/designate-sink/Dockerfile.j2 | 2 +- docker/designate/designate-worker/Dockerfile.j2 | 2 +- docker/dind/Dockerfile.j2 | 2 +- docker/dnsmasq/Dockerfile.j2 | 2 +- docker/elasticsearch/Dockerfile.j2 | 2 +- docker/etcd/Dockerfile.j2 | 2 +- docker/fluentd/Dockerfile.j2 | 2 +- docker/freezer/freezer-api/Dockerfile.j2 | 2 +- docker/freezer/freezer-base/Dockerfile.j2 | 2 +- docker/glance/glance-api/Dockerfile.j2 | 2 +- docker/glance/glance-base/Dockerfile.j2 | 2 +- docker/glance/glance-registry/Dockerfile.j2 | 2 +- docker/gnocchi/gnocchi-api/Dockerfile.j2 | 2 +- docker/gnocchi/gnocchi-base/Dockerfile.j2 | 2 +- docker/gnocchi/gnocchi-metricd/Dockerfile.j2 | 2 +- docker/gnocchi/gnocchi-statsd/Dockerfile.j2 | 2 +- docker/grafana/Dockerfile.j2 | 2 +- docker/haproxy/Dockerfile.j2 | 2 +- docker/heat/heat-all/Dockerfile.j2 | 2 +- docker/heat/heat-api-cfn/Dockerfile.j2 | 2 +- docker/heat/heat-api-cloudwatch/Dockerfile.j2 | 2 +- docker/heat/heat-api/Dockerfile.j2 | 2 +- docker/heat/heat-base/Dockerfile.j2 | 2 +- docker/heat/heat-engine/Dockerfile.j2 | 2 +- docker/helm-repository/Dockerfile.j2 | 2 +- docker/horizon/Dockerfile.j2 | 2 +- docker/influxdb/Dockerfile.j2 | 2 +- docker/ironic-inspector/Dockerfile.j2 | 2 +- docker/ironic/ironic-api/Dockerfile.j2 | 2 +- docker/ironic/ironic-base/Dockerfile.j2 | 2 +- docker/ironic/ironic-conductor/Dockerfile.j2 | 2 +- docker/ironic/ironic-pxe/Dockerfile.j2 | 2 +- docker/iscsid/Dockerfile.j2 | 2 +- docker/kafka/Dockerfile.j2 | 2 +- docker/karbor/karbor-api/Dockerfile.j2 | 2 +- docker/karbor/karbor-base/Dockerfile.j2 | 2 +- docker/karbor/karbor-operationengine/Dockerfile.j2 | 2 +- docker/karbor/karbor-protection/Dockerfile.j2 | 2 +- docker/keepalived/Dockerfile.j2 | 2 +- docker/keystone/keystone-base/Dockerfile.j2 | 2 +- docker/keystone/keystone-fernet/Dockerfile.j2 | 2 +- docker/keystone/keystone-ssh/Dockerfile.j2 | 2 +- docker/keystone/keystone/Dockerfile.j2 | 2 +- docker/kibana/Dockerfile.j2 | 2 +- docker/kolla-toolbox/Dockerfile.j2 | 2 +- docker/kube/kube-apiserver-amd64/Dockerfile.j2 | 2 +- docker/kube/kube-base/Dockerfile.j2 | 2 +- docker/kube/kube-controller-manager-amd64/Dockerfile.j2 | 2 +- docker/kube/kube-discovery-amd64/Dockerfile.j2 | 2 +- docker/kube/kube-proxy-amd64/Dockerfile.j2 | 2 +- docker/kube/kube-scheduler-amd64/Dockerfile.j2 | 2 +- docker/kubernetes-entrypoint/Dockerfile.j2 | 2 +- docker/kubetoolbox/Dockerfile.j2 | 2 +- docker/kuryr/kuryr-base/Dockerfile.j2 | 2 +- docker/kuryr/kuryr-libnetwork/Dockerfile.j2 | 2 +- docker/magnum/magnum-api/Dockerfile.j2 | 2 +- docker/magnum/magnum-base/Dockerfile.j2 | 2 +- docker/magnum/magnum-conductor/Dockerfile.j2 | 2 +- docker/manila/manila-api/Dockerfile.j2 | 2 +- docker/manila/manila-base/Dockerfile.j2 | 2 +- docker/manila/manila-data/Dockerfile.j2 | 2 +- docker/manila/manila-scheduler/Dockerfile.j2 | 2 +- docker/manila/manila-share/Dockerfile.j2 | 2 +- docker/mariadb/Dockerfile.j2 | 2 +- docker/memcached/Dockerfile.j2 | 2 +- docker/mistral/mistral-api/Dockerfile.j2 | 2 +- docker/mistral/mistral-base/Dockerfile.j2 | 2 +- docker/mistral/mistral-engine/Dockerfile.j2 | 2 +- docker/mistral/mistral-executor/Dockerfile.j2 | 2 +- docker/monasca/monasca-api/Dockerfile.j2 | 2 +- docker/monasca/monasca-base/Dockerfile.j2 | 2 +- docker/monasca/monasca-log-api/Dockerfile.j2 | 2 +- docker/monasca/monasca-notification/Dockerfile.j2 | 2 +- docker/monasca/monasca-persister/Dockerfile.j2 | 2 +- docker/monasca/monasca-statsd/Dockerfile.j2 | 2 +- docker/mongodb/Dockerfile.j2 | 2 +- docker/multipathd/Dockerfile.j2 | 2 +- docker/murano/murano-api/Dockerfile.j2 | 2 +- docker/murano/murano-base/Dockerfile.j2 | 2 +- docker/murano/murano-engine/Dockerfile.j2 | 2 +- docker/neutron/neutron-base/Dockerfile.j2 | 2 +- docker/neutron/neutron-bgp-dragent/Dockerfile.j2 | 2 +- docker/neutron/neutron-dhcp-agent/Dockerfile.j2 | 2 +- docker/neutron/neutron-l3-agent/Dockerfile.j2 | 2 +- docker/neutron/neutron-lbaas-agent/Dockerfile.j2 | 2 +- docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 2 +- docker/neutron/neutron-metadata-agent/Dockerfile.j2 | 2 +- docker/neutron/neutron-metering-agent/Dockerfile.j2 | 2 +- docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 2 +- docker/neutron/neutron-server/Dockerfile.j2 | 2 +- docker/neutron/neutron-sfc-agent/Dockerfile.j2 | 2 +- docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 | 2 +- docker/nova/nova-api/Dockerfile.j2 | 2 +- docker/nova/nova-base/Dockerfile.j2 | 2 +- docker/nova/nova-compute-ironic/Dockerfile.j2 | 2 +- docker/nova/nova-compute/Dockerfile.j2 | 2 +- docker/nova/nova-conductor/Dockerfile.j2 | 2 +- docker/nova/nova-consoleauth/Dockerfile.j2 | 2 +- docker/nova/nova-libvirt/Dockerfile.j2 | 2 +- docker/nova/nova-novncproxy/Dockerfile.j2 | 2 +- docker/nova/nova-placement-api/Dockerfile.j2 | 2 +- docker/nova/nova-scheduler/Dockerfile.j2 | 2 +- docker/nova/nova-serialproxy/Dockerfile.j2 | 2 +- docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 2 +- docker/nova/nova-ssh/Dockerfile.j2 | 2 +- docker/octavia/octavia-api/Dockerfile.j2 | 2 +- docker/octavia/octavia-base/Dockerfile.j2 | 2 +- docker/octavia/octavia-health-manager/Dockerfile.j2 | 2 +- docker/octavia/octavia-housekeeping/Dockerfile.j2 | 2 +- docker/octavia/octavia-worker/Dockerfile.j2 | 2 +- docker/opendaylight/Dockerfile.j2 | 2 +- docker/openstack-base/Dockerfile.j2 | 2 +- docker/openvswitch/openvswitch-base/Dockerfile.j2 | 2 +- docker/openvswitch/openvswitch-db-server/Dockerfile.j2 | 2 +- docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 | 2 +- docker/panko/panko-api/Dockerfile.j2 | 2 +- docker/panko/panko-base/Dockerfile.j2 | 2 +- docker/rabbitmq/Dockerfile.j2 | 2 +- docker/rally/Dockerfile.j2 | 2 +- docker/redis/Dockerfile.j2 | 2 +- docker/sahara/sahara-api/Dockerfile.j2 | 2 +- docker/sahara/sahara-base/Dockerfile.j2 | 2 +- docker/sahara/sahara-engine/Dockerfile.j2 | 2 +- docker/searchlight/searchlight-api/Dockerfile.j2 | 2 +- docker/searchlight/searchlight-base/Dockerfile.j2 | 2 +- docker/searchlight/searchlight-listener/Dockerfile.j2 | 2 +- docker/senlin/senlin-api/Dockerfile.j2 | 2 +- docker/senlin/senlin-base/Dockerfile.j2 | 2 +- docker/senlin/senlin-engine/Dockerfile.j2 | 2 +- docker/solum/solum-api/Dockerfile.j2 | 2 +- docker/solum/solum-base/Dockerfile.j2 | 2 +- docker/solum/solum-conductor/Dockerfile.j2 | 2 +- docker/solum/solum-deployer/Dockerfile.j2 | 2 +- docker/solum/solum-worker/Dockerfile.j2 | 2 +- docker/swift/swift-account/Dockerfile.j2 | 2 +- docker/swift/swift-base/Dockerfile.j2 | 2 +- docker/swift/swift-container/Dockerfile.j2 | 2 +- docker/swift/swift-object-expirer/Dockerfile.j2 | 2 +- docker/swift/swift-object/Dockerfile.j2 | 2 +- docker/swift/swift-proxy-server/Dockerfile.j2 | 2 +- docker/swift/swift-rsyncd/Dockerfile.j2 | 2 +- docker/tacker/Dockerfile.j2 | 2 +- docker/telegraf/Dockerfile.j2 | 2 +- docker/tempest/Dockerfile.j2 | 2 +- docker/tgtd/Dockerfile.j2 | 2 +- docker/trove/trove-api/Dockerfile.j2 | 2 +- docker/trove/trove-base/Dockerfile.j2 | 2 +- docker/trove/trove-conductor/Dockerfile.j2 | 2 +- docker/trove/trove-guestagent/Dockerfile.j2 | 2 +- docker/trove/trove-taskmanager/Dockerfile.j2 | 2 +- docker/vitrage/vitrage-api/Dockerfile.j2 | 2 +- docker/vitrage/vitrage-base/Dockerfile.j2 | 2 +- docker/vitrage/vitrage-graph/Dockerfile.j2 | 2 +- docker/vitrage/vitrage-notifier/Dockerfile.j2 | 2 +- docker/vmtp/Dockerfile.j2 | 2 +- docker/watcher/watcher-api/Dockerfile.j2 | 2 +- docker/watcher/watcher-applier/Dockerfile.j2 | 2 +- docker/watcher/watcher-base/Dockerfile.j2 | 2 +- docker/watcher/watcher-engine/Dockerfile.j2 | 2 +- docker/zaqar/Dockerfile.j2 | 2 +- docker/zookeeper/Dockerfile.j2 | 2 +- docker/zun/zun-api/Dockerfile.j2 | 2 +- docker/zun/zun-base/Dockerfile.j2 | 2 +- docker/zun/zun-compute/Dockerfile.j2 | 2 +- releasenotes/notes/MAINTAINER-to-LABEL-344044f33ccfa161.yaml | 5 +++++ tools/validate-maintainer.sh | 2 +- 212 files changed, 216 insertions(+), 211 deletions(-) create mode 100644 releasenotes/notes/MAINTAINER-to-LABEL-344044f33ccfa161.yaml diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index a0ba42fb8d..55221dd744 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block aodh_api_header %}{% endblock %} diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index dd35adce12..b10cc36dd6 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block aodh_base_header %}{% endblock %} diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index 0113ed9ad6..60bef0fcf8 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/docker/aodh/aodh-evaluator/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block aodh_evaluator_header %}{% endblock %} diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index 5df4326f11..e740284c56 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/docker/aodh/aodh-expirer/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block aodh_expirer_header %}{% endblock %} diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index e10598c51f..c2889a5927 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/docker/aodh/aodh-listener/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block aodh_listener_header %}{% endblock %} diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index ea2f61c2e8..111de77f69 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/docker/aodh/aodh-notifier/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block aodh_notifier_header %}{% endblock %} diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2 index ee0d717eb1..1662adaee7 100644 --- a/docker/barbican/barbican-api/Dockerfile.j2 +++ b/docker/barbican/barbican-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block barbican_api_header %}{% endblock %} diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index 8f60695c74..95f60b12c8 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/docker/barbican/barbican-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block barbican_base_header %}{% endblock %} diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/docker/barbican/barbican-keystone-listener/Dockerfile.j2 index 581c142c54..85174dab17 100644 --- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 +++ b/docker/barbican/barbican-keystone-listener/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block barbican_keystone_listener_header %}{% endblock %} diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/docker/barbican/barbican-worker/Dockerfile.j2 index 7c3bf96e89..c6b079d032 100644 --- a/docker/barbican/barbican-worker/Dockerfile.j2 +++ b/docker/barbican/barbican-worker/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block barbican_worker_header %}{% endblock %} diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index bd3dec7546..8eb65c8212 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ base_image }}:{{ base_distro_tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {# 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 #} diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 2385f00e47..31d6095751 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block bifrost_base_header %}{% endblock %} diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/docker/bifrost/bifrost-deploy/Dockerfile.j2 index 1ba27ee0ee..f0f3f9d084 100644 --- a/docker/bifrost/bifrost-deploy/Dockerfile.j2 +++ b/docker/bifrost/bifrost-deploy/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}bifrost-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block bifrost_deploy_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 5923452be9..a445520997 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceilometer_api_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index edd9b5a960..3141eabc5b 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceilometer_base_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index ae697df9df..627034f2d2 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceilometer_central_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index da4520447c..8e03b26c51 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceilometer_collector_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 1363d9dd93..0ed8d26c95 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceilometer_compute_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 74572395bb..28b1d2a81f 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceilometer_notification_header %}{% endblock %} diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 885c8e4999..6298748439 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceph_base_header %}{% endblock %} diff --git a/docker/ceph/ceph-mds/Dockerfile.j2 b/docker/ceph/ceph-mds/Dockerfile.j2 index 61c64fba09..42f516ee12 100644 --- a/docker/ceph/ceph-mds/Dockerfile.j2 +++ b/docker/ceph/ceph-mds/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceph_mds_header %}{% endblock %} diff --git a/docker/ceph/ceph-mon/Dockerfile.j2 b/docker/ceph/ceph-mon/Dockerfile.j2 index 06ff6bfd42..8b2ed4064d 100644 --- a/docker/ceph/ceph-mon/Dockerfile.j2 +++ b/docker/ceph/ceph-mon/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceph_mon_header %}{% endblock %} diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2 index a521189dfd..6c84bcd95a 100644 --- a/docker/ceph/ceph-osd/Dockerfile.j2 +++ b/docker/ceph/ceph-osd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceph_osd_header %}{% endblock %} diff --git a/docker/ceph/ceph-rgw/Dockerfile.j2 b/docker/ceph/ceph-rgw/Dockerfile.j2 index 156ba4956a..13b4716cd8 100644 --- a/docker/ceph/ceph-rgw/Dockerfile.j2 +++ b/docker/ceph/ceph-rgw/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceph_rgw_header %}{% endblock %} diff --git a/docker/ceph/cephfs-fuse/Dockerfile.j2 b/docker/ceph/cephfs-fuse/Dockerfile.j2 index d738a73dd8..53c7ee45fe 100644 --- a/docker/ceph/cephfs-fuse/Dockerfile.j2 +++ b/docker/ceph/cephfs-fuse/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cephfs_fuse_header %}{% endblock %} diff --git a/docker/chrony/Dockerfile.j2 b/docker/chrony/Dockerfile.j2 index 13b059020c..98b7d9772a 100644 --- a/docker/chrony/Dockerfile.j2 +++ b/docker/chrony/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block chrony_header %}{% endblock %} diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 8121a6b136..a0b0e3ab7a 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cinder_api_header %}{% endblock %} diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 6158d46ac9..a7284fcd3c 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cinder_backup_header %}{% endblock %} diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index f23dee03c1..e58cde95bc 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cinder_base_header %}{% endblock %} diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index 4c6dcb74ca..b521ff706e 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cinder_scheduler_header %}{% endblock %} diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index dda9168079..2c8e50f129 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cinder_volume_header %}{% endblock %} diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 18c883fcfa..b378868e05 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cloudkitty_api_header %}{% endblock %} diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 index 110aa00a17..0885e765da 100644 --- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cloudkitty_base_header %}{% endblock %} diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 index b32f416881..334900d19d 100644 --- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cloudkitty_processor_header %}{% endblock %} diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index d22bea01a2..1c1caafe72 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block collectd_header %}{% endblock %} diff --git a/docker/congress/congress-api/Dockerfile.j2 b/docker/congress/congress-api/Dockerfile.j2 index eb1d35493c..3e0b7694b3 100644 --- a/docker/congress/congress-api/Dockerfile.j2 +++ b/docker/congress/congress-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block congress_api_header %}{% endblock %} diff --git a/docker/congress/congress-base/Dockerfile.j2 b/docker/congress/congress-base/Dockerfile.j2 index 863adce71d..cecd47ecc9 100644 --- a/docker/congress/congress-base/Dockerfile.j2 +++ b/docker/congress/congress-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix}}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block congress_base_header %}{% endblock %} diff --git a/docker/congress/congress-datasource/Dockerfile.j2 b/docker/congress/congress-datasource/Dockerfile.j2 index 61f144e003..e858b5762f 100644 --- a/docker/congress/congress-datasource/Dockerfile.j2 +++ b/docker/congress/congress-datasource/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block congress_datasource_header %}{% endblock %} diff --git a/docker/congress/congress-policy-engine/Dockerfile.j2 b/docker/congress/congress-policy-engine/Dockerfile.j2 index 74d9ce11d8..6734cf2236 100644 --- a/docker/congress/congress-policy-engine/Dockerfile.j2 +++ b/docker/congress/congress-policy-engine/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block congress_policy_engine_header %}{% endblock %} diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2 index 02960858c8..85d02649c5 100644 --- a/docker/cron/Dockerfile.j2 +++ b/docker/cron/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cron_header %}{% endblock %} diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index 2f09753137..f42f1c2074 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block designate_api_header %}{% endblock %} diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index e70d026033..4e70a0b931 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block designate_backend_bind9_header %}{% endblock %} diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index dfa69c585e..978ea6391e 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block designate_base_header %}{% endblock %} diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index 0e6ef8d7a0..6845a563db 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block designate_central_header %}{% endblock %} diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index 24b5dc1d67..9c9f57423d 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block designate_mdns_header %}{% endblock %} diff --git a/docker/designate/designate-pool-manager/Dockerfile.j2 b/docker/designate/designate-pool-manager/Dockerfile.j2 index 3d8763c625..d61c06075a 100644 --- a/docker/designate/designate-pool-manager/Dockerfile.j2 +++ b/docker/designate/designate-pool-manager/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block designate_pool_manager_header %}{% endblock %} diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 37a2802dba..5a72fc94e8 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block designate_sink_header %}{% endblock %} diff --git a/docker/designate/designate-worker/Dockerfile.j2 b/docker/designate/designate-worker/Dockerfile.j2 index 98cc4c45fa..e7f3ad9613 100644 --- a/docker/designate/designate-worker/Dockerfile.j2 +++ b/docker/designate/designate-worker/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block designate_worker_header %}{% endblock %} diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index cef161c67d..1ba85872f3 100644 --- a/docker/dind/Dockerfile.j2 +++ b/docker/dind/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block dind_header %}{% endblock %} diff --git a/docker/dnsmasq/Dockerfile.j2 b/docker/dnsmasq/Dockerfile.j2 index bcf62102d1..af079935b6 100644 --- a/docker/dnsmasq/Dockerfile.j2 +++ b/docker/dnsmasq/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block dnsmasq_header %}{% endblock %} diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index 624ec74beb..0246c8eff3 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block elasticsearch_header %}{% endblock %} diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2 index fdc79cf49d..9acbb931c6 100644 --- a/docker/etcd/Dockerfile.j2 +++ b/docker/etcd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block etcd_header %}{% endblock %} diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index ff7236aa92..5e004ce8d6 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block fluentd_header %}{% endblock %} diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2 index dfb0a28b68..95fe2bd3ae 100644 --- a/docker/freezer/freezer-api/Dockerfile.j2 +++ b/docker/freezer/freezer-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}freezer-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block freezer_api_header %}{% endblock %} diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2 index 8f138aa033..4e523415f0 100644 --- a/docker/freezer/freezer-base/Dockerfile.j2 +++ b/docker/freezer/freezer-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block freezer_base_header %}{% endblock %} diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index b6d3b112fd..0a88663bc0 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block glance_api_header %}{% endblock %} diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index c83c940c2c..aee58fbdbf 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block glance_base_header %}{% endblock %} diff --git a/docker/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2 index a5e217e96c..afc94595ce 100644 --- a/docker/glance/glance-registry/Dockerfile.j2 +++ b/docker/glance/glance-registry/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block glance_registry_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index 553689285d..6a0bcfd319 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block gnocchi_api_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 4f7d60f362..c49e557d35 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block gnocchi_base_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 index 7d4a384727..fe9ca8e422 100644 --- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block gnocchi_metricd_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 index 399cc9535d..7929235b4f 100644 --- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block gnocchi_statsd_header %}{% endblock %} diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index cf4665b97d..8678a39233 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block grafana_header %}{% endblock %} diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index a4a4def715..d87a754a84 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block haproxy_header %}{% endblock %} diff --git a/docker/heat/heat-all/Dockerfile.j2 b/docker/heat/heat-all/Dockerfile.j2 index 9acb739658..afe73dc5ba 100644 --- a/docker/heat/heat-all/Dockerfile.j2 +++ b/docker/heat/heat-all/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block heat_all_header %}{% endblock %} diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 7ea7318e70..c3567080f0 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block heat_api_cfn_header %}{% endblock %} diff --git a/docker/heat/heat-api-cloudwatch/Dockerfile.j2 b/docker/heat/heat-api-cloudwatch/Dockerfile.j2 index 3c3d2ccf0d..a168c8726a 100644 --- a/docker/heat/heat-api-cloudwatch/Dockerfile.j2 +++ b/docker/heat/heat-api-cloudwatch/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block heat_api_cloudwatch_header %}{% endblock %} diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index e021ad02d2..7a7de552f7 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block heat_api_header %}{% endblock %} diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 3b900fa180..de3660f625 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block heat_base_header %}{% endblock %} diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 7b753df653..0b4fc5fbfc 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block heat_engine_header %}{% endblock %} diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2 index 84ba53f1ba..0f132bc23f 100644 --- a/docker/helm-repository/Dockerfile.j2 +++ b/docker/helm-repository/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block helm_repository_version %} ENV helm_version=2.1.3 \ diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 4474da954c..238cb468b2 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block horizon_header %}{% endblock %} diff --git a/docker/influxdb/Dockerfile.j2 b/docker/influxdb/Dockerfile.j2 index 649867a29a..2059c19c0b 100644 --- a/docker/influxdb/Dockerfile.j2 +++ b/docker/influxdb/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block influxdb_header %}{% endblock %} diff --git a/docker/ironic-inspector/Dockerfile.j2 b/docker/ironic-inspector/Dockerfile.j2 index eea19fca72..b7a13f0196 100644 --- a/docker/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic-inspector/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ironic_inspector_header %}{% endblock %} diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index fc86e7b462..48b9c89cc6 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ironic_api_header %}{% endblock %} diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 99d4529064..169043a006 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ironic_base_header %}{% endblock %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 3da04baba6..a9bd1e5114 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ironic_conductor_header %}{% endblock %} diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index bfb23b0c4c..5edf53b2e6 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ironic_pxe_header %}{% endblock %} diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index 4b56de6306..b5538ad002 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block iscsid_header %}{% endblock %} diff --git a/docker/kafka/Dockerfile.j2 b/docker/kafka/Dockerfile.j2 index a2d1fcde3b..92e4fe1759 100644 --- a/docker/kafka/Dockerfile.j2 +++ b/docker/kafka/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block kafka_header %}{% endblock %} diff --git a/docker/karbor/karbor-api/Dockerfile.j2 b/docker/karbor/karbor-api/Dockerfile.j2 index 9be12b5215..6453c93f94 100644 --- a/docker/karbor/karbor-api/Dockerfile.j2 +++ b/docker/karbor/karbor-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block karbor_api_header %}{% endblock %} diff --git a/docker/karbor/karbor-base/Dockerfile.j2 b/docker/karbor/karbor-base/Dockerfile.j2 index 15c3552052..5cd103cf35 100644 --- a/docker/karbor/karbor-base/Dockerfile.j2 +++ b/docker/karbor/karbor-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block karbor_base_header %}{% endblock %} diff --git a/docker/karbor/karbor-operationengine/Dockerfile.j2 b/docker/karbor/karbor-operationengine/Dockerfile.j2 index 99beb28ae2..a3763cc6f0 100644 --- a/docker/karbor/karbor-operationengine/Dockerfile.j2 +++ b/docker/karbor/karbor-operationengine/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block karbor_operationengine_header %}{% endblock %} diff --git a/docker/karbor/karbor-protection/Dockerfile.j2 b/docker/karbor/karbor-protection/Dockerfile.j2 index 28ddf5f4c9..3a5bfb7b73 100644 --- a/docker/karbor/karbor-protection/Dockerfile.j2 +++ b/docker/karbor/karbor-protection/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block karbor_protection_header %}{% endblock %} diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index db67e52e8a..abf043d992 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block keepalived_header %}{% endblock %} diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 092a038e70..45d4484405 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block keystone_base_header %}{% endblock %} diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2 index d2c4d741ea..16ae8ead0c 100644 --- a/docker/keystone/keystone-fernet/Dockerfile.j2 +++ b/docker/keystone/keystone-fernet/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block keystone_fernet_header %}{% endblock %} diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 1e795f297f..6b93fdc1d8 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block keystone_ssh_header %}{% endblock %} diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 196874b1a5..8a0c94095d 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block keystone_header %}{% endblock %} diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index d6cfddd0a6..fdfa86c287 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block kibana_header %}{% endblock %} diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index e15958af88..ffffa8b643 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block kolla_toolbox_header %}{% endblock %} diff --git a/docker/kube/kube-apiserver-amd64/Dockerfile.j2 b/docker/kube/kube-apiserver-amd64/Dockerfile.j2 index 28e61aea6f..86cd202630 100644 --- a/docker/kube/kube-apiserver-amd64/Dockerfile.j2 +++ b/docker/kube/kube-apiserver-amd64/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" ENV KUBERNETES_COMPONENT=kube-apiserver diff --git a/docker/kube/kube-base/Dockerfile.j2 b/docker/kube/kube-base/Dockerfile.j2 index 0e4da1c109..6f6e64babd 100644 --- a/docker/kube/kube-base/Dockerfile.j2 +++ b/docker/kube/kube-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" ENV KUBERNETES_VERSION=v1.5.4 diff --git a/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 b/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 index 3c89596139..abbb84ba8a 100644 --- a/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 +++ b/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" ENV KUBERNETES_COMPONENT=kube-controller-manager diff --git a/docker/kube/kube-discovery-amd64/Dockerfile.j2 b/docker/kube/kube-discovery-amd64/Dockerfile.j2 index ca62cefefa..f8bfeff11b 100644 --- a/docker/kube/kube-discovery-amd64/Dockerfile.j2 +++ b/docker/kube/kube-discovery-amd64/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" ENV KUBERNETES_COMPONENT=kube-discovery diff --git a/docker/kube/kube-proxy-amd64/Dockerfile.j2 b/docker/kube/kube-proxy-amd64/Dockerfile.j2 index 0bfde90fad..234bdb8d62 100644 --- a/docker/kube/kube-proxy-amd64/Dockerfile.j2 +++ b/docker/kube/kube-proxy-amd64/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" ENV KUBERNETES_COMPONENT=kube-proxy diff --git a/docker/kube/kube-scheduler-amd64/Dockerfile.j2 b/docker/kube/kube-scheduler-amd64/Dockerfile.j2 index 7c32865be5..5a8579d811 100644 --- a/docker/kube/kube-scheduler-amd64/Dockerfile.j2 +++ b/docker/kube/kube-scheduler-amd64/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" ENV KUBERNETES_COMPONENT=kube-scheduler diff --git a/docker/kubernetes-entrypoint/Dockerfile.j2 b/docker/kubernetes-entrypoint/Dockerfile.j2 index d303cf0dab..b39abab42a 100644 --- a/docker/kubernetes-entrypoint/Dockerfile.j2 +++ b/docker/kubernetes-entrypoint/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block kubernetes_entrypoint_header %}{% endblock %} diff --git a/docker/kubetoolbox/Dockerfile.j2 b/docker/kubetoolbox/Dockerfile.j2 index 11790dbb4a..e5945c2512 100644 --- a/docker/kubetoolbox/Dockerfile.j2 +++ b/docker/kubetoolbox/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block kubetoolbox_header %}{% endblock %} diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 index 5911d343ed..375ab4c865 100644 --- a/docker/kuryr/kuryr-base/Dockerfile.j2 +++ b/docker/kuryr/kuryr-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block kuryr_base_header %}{% endblock %} diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 index b153451c6c..808dcccd7c 100644 --- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 +++ b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}kuryr-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block kuryr_libnetwork_header %}{% endblock %} diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index b8a8e7b6f7..6cf88e61d6 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block magnum_api_header %}{% endblock %} diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index e6f49b58cb..cc99874f25 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block magnum_base_header %}{% endblock %} diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 085b4fd177..0452a168ce 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block magnum_conductor_header %}{% endblock %} diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index c5be544d09..259435a6e7 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block manila_api_header %}{% endblock %} diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index 863d312035..57f1ce0c4e 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block manila_base_header %}{% endblock %} diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index a14e5bb66f..65c15b818a 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block manila_data_header %}{% endblock %} diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2 index 75adfc06e6..c0c84f15f6 100644 --- a/docker/manila/manila-scheduler/Dockerfile.j2 +++ b/docker/manila/manila-scheduler/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block manila_scheduler_header %}{% endblock %} diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index d0a99ffd39..4630d2d070 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block manila_share_header %}{% endblock %} diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 74834f9fbe..0d2ea7a0d8 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block mariadb_header %}{% endblock %} diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index 55a003529a..ef1fffaab4 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block memcached_header %}{% endblock %} diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index 12bfd27930..018331a438 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block mistral_api_header %}{% endblock %} diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2 index 0d8a969401..9411c097f9 100644 --- a/docker/mistral/mistral-base/Dockerfile.j2 +++ b/docker/mistral/mistral-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block mistral_base_header %}{% endblock %} diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2 index eb86821c9e..c144b5ed06 100644 --- a/docker/mistral/mistral-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-engine/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block mistral_engine_header %}{% endblock %} diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2 index 6f34b8002b..ed2888b80f 100644 --- a/docker/mistral/mistral-executor/Dockerfile.j2 +++ b/docker/mistral/mistral-executor/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block mistral_executor_header %}{% endblock %} diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2 index b0375641c5..07e26019d1 100644 --- a/docker/monasca/monasca-api/Dockerfile.j2 +++ b/docker/monasca/monasca-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block monasca_api_header %}{% endblock %} diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2 index 80f1fcda01..6030ede969 100644 --- a/docker/monasca/monasca-base/Dockerfile.j2 +++ b/docker/monasca/monasca-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block monasca_base_header %}{% endblock %} diff --git a/docker/monasca/monasca-log-api/Dockerfile.j2 b/docker/monasca/monasca-log-api/Dockerfile.j2 index 83c621c6dc..9077bd7ab5 100644 --- a/docker/monasca/monasca-log-api/Dockerfile.j2 +++ b/docker/monasca/monasca-log-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block monasca_log_api_header %}{% endblock %} diff --git a/docker/monasca/monasca-notification/Dockerfile.j2 b/docker/monasca/monasca-notification/Dockerfile.j2 index 8433c98f1c..7c344683e1 100644 --- a/docker/monasca/monasca-notification/Dockerfile.j2 +++ b/docker/monasca/monasca-notification/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block monasca_notification_header %}{% endblock %} diff --git a/docker/monasca/monasca-persister/Dockerfile.j2 b/docker/monasca/monasca-persister/Dockerfile.j2 index a48a46431f..624565f7a4 100644 --- a/docker/monasca/monasca-persister/Dockerfile.j2 +++ b/docker/monasca/monasca-persister/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block monasca_persister_header %}{% endblock %} diff --git a/docker/monasca/monasca-statsd/Dockerfile.j2 b/docker/monasca/monasca-statsd/Dockerfile.j2 index 3320f4e2a8..aa353e7d34 100644 --- a/docker/monasca/monasca-statsd/Dockerfile.j2 +++ b/docker/monasca/monasca-statsd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block monasca_api_header %}{% endblock %} diff --git a/docker/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2 index 242bbea7e3..b142dfb5bf 100644 --- a/docker/mongodb/Dockerfile.j2 +++ b/docker/mongodb/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block mongodb_header %}{% endblock %} diff --git a/docker/multipathd/Dockerfile.j2 b/docker/multipathd/Dockerfile.j2 index 66b25fdab0..aa75530a48 100644 --- a/docker/multipathd/Dockerfile.j2 +++ b/docker/multipathd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block multipathd_header %}{% endblock %} diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index a897dffc83..d449133869 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block murano_api_header %}{% endblock %} diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 514d91f873..36b55c5efb 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block murano_base_header %}{% endblock %} diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index 615e31c1de..1de0e69b95 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block murano_engine_header %}{% endblock %} diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index b95e02c518..a696108c78 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block neutron_base_header %}{% endblock %} diff --git a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 index 525258b9fc..741fb31529 100644 --- a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 +++ b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% 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 8210234085..30aff6d0a0 100644 --- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block neutron_dhcp_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2 index 8d5e5cb9c2..5b156b72dd 100644 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block neutron_l3_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 index e755b6a42f..a428588790 100644 --- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block neutron_lbaas_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 20f160c2e7..9707a2bcb1 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block neutron_linuxbridge_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 80f7fb4a69..dbfa12ee08 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% 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 e12c23f4a7..2d489bbdf9 100644 --- a/docker/neutron/neutron-metering-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metering-agent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block neutron_metering_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index ad33293524..d72174d5f5 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block neutron_openvswitch_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 535aeae724..5aae6b47fc 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block neutron_server_header %}{% endblock %} diff --git a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 index 9e1cb16029..1ea3f01bcd 100644 --- a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block neutron_networking_sfc_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 index 5b18c54579..1611ea81eb 100644 --- a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block neutron_vpnaas_agent_header %}{% endblock %} diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index e31d7abc2a..966fdbb996 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_api_header %}{% endblock %} diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index c3bc21d892..e4f4652a22 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_base_header %}{% endblock %} diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index 04ba490700..947d842572 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_compute_ironic_header %}{% endblock %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 256c92d23d..a2109dc7fe 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_compute_header %}{% endblock %} diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index b2c1cc23ed..8c5ce5d1d3 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_conductor_header %}{% endblock %} diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2 index b80a68329f..6f4af35b09 100644 --- a/docker/nova/nova-consoleauth/Dockerfile.j2 +++ b/docker/nova/nova-consoleauth/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_consoleauth_header %}{% endblock %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 7adb7ba3ac..5d10249618 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_libvirt_header %}{% endblock %} diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index 62cc9b5f33..0091e7aa82 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_novncproxy_header %}{% endblock %} diff --git a/docker/nova/nova-placement-api/Dockerfile.j2 b/docker/nova/nova-placement-api/Dockerfile.j2 index 69405dee2b..20293a1a5d 100644 --- a/docker/nova/nova-placement-api/Dockerfile.j2 +++ b/docker/nova/nova-placement-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_placement_api_header %}{% endblock %} diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index f7ddb228f4..7d4fdc7b8d 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_scheduler_header %}{% endblock %} diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2 index a0f222886a..558dd01917 100644 --- a/docker/nova/nova-serialproxy/Dockerfile.j2 +++ b/docker/nova/nova-serialproxy/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_serialproxy_header %}{% endblock %} diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 88e6c3aa98..eb42771811 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_spicehtml5proxy_header %}{% endblock %} diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index bbee5dbe34..530e46aea3 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_ssh_header %}{% endblock %} diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/docker/octavia/octavia-api/Dockerfile.j2 index 8beb3180ad..a4feb26ad4 100644 --- a/docker/octavia/octavia-api/Dockerfile.j2 +++ b/docker/octavia/octavia-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block octavia_api_header %}{% endblock %} diff --git a/docker/octavia/octavia-base/Dockerfile.j2 b/docker/octavia/octavia-base/Dockerfile.j2 index 2edfc0e000..9a7f0f8801 100644 --- a/docker/octavia/octavia-base/Dockerfile.j2 +++ b/docker/octavia/octavia-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block octavia_base_header %}{% endblock %} diff --git a/docker/octavia/octavia-health-manager/Dockerfile.j2 b/docker/octavia/octavia-health-manager/Dockerfile.j2 index 7ed051a4a1..a20c2ec8ae 100644 --- a/docker/octavia/octavia-health-manager/Dockerfile.j2 +++ b/docker/octavia/octavia-health-manager/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block octavia_health_manager_header %}{% endblock %} diff --git a/docker/octavia/octavia-housekeeping/Dockerfile.j2 b/docker/octavia/octavia-housekeeping/Dockerfile.j2 index 40202cad9c..04cf3b1947 100644 --- a/docker/octavia/octavia-housekeeping/Dockerfile.j2 +++ b/docker/octavia/octavia-housekeeping/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block octavia_housekeeping_header %}{% endblock %} diff --git a/docker/octavia/octavia-worker/Dockerfile.j2 b/docker/octavia/octavia-worker/Dockerfile.j2 index e185216ee0..277f6c3ae3 100644 --- a/docker/octavia/octavia-worker/Dockerfile.j2 +++ b/docker/octavia/octavia-worker/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block octavia_worker_header %}{% endblock %} diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2 index 81c4a0d74a..a3b3239816 100644 --- a/docker/opendaylight/Dockerfile.j2 +++ b/docker/opendaylight/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block opendaylight_header %}{% endblock %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 38edfcc089..7bc4fb9820 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block openstack_base_header %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 60e4d8a625..dcb4278aa2 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block openvswitch_base_header %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index 1b23732d6c..191b2360cd 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block openvswitch_db_server_header %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index 19535d0b17..618848f624 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block openvswitch_vswitchd_header %}{% endblock %} diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2 index d66fe37c9e..f1be6620f5 100644 --- a/docker/panko/panko-api/Dockerfile.j2 +++ b/docker/panko/panko-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}panko-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block panko_api_header %}{% endblock %} diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 index 42bc7ec900..81ad6b6cfe 100644 --- a/docker/panko/panko-base/Dockerfile.j2 +++ b/docker/panko/panko-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block panko_base_header %}{% endblock %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 711dbd23ed..dd73eb6975 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block rabbitmq_header %}{% endblock %} diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index 46c7072073..facaf9e15d 100644 --- a/docker/rally/Dockerfile.j2 +++ b/docker/rally/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block rally_header %}{% endblock %} diff --git a/docker/redis/Dockerfile.j2 b/docker/redis/Dockerfile.j2 index 65fa9fb63a..964b07591e 100644 --- a/docker/redis/Dockerfile.j2 +++ b/docker/redis/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block redis_header %}{% endblock %} diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2 index 188198c18b..7ea5b2149e 100644 --- a/docker/sahara/sahara-api/Dockerfile.j2 +++ b/docker/sahara/sahara-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block sahara_api_header %}{% endblock %} diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2 index ff8c3b5beb..5ccaed8075 100644 --- a/docker/sahara/sahara-base/Dockerfile.j2 +++ b/docker/sahara/sahara-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block sahara_base_header %}{% endblock %} diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2 index 20e9c0cf4f..01e78a9a19 100644 --- a/docker/sahara/sahara-engine/Dockerfile.j2 +++ b/docker/sahara/sahara-engine/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block sahara_engine_header %}{% endblock %} diff --git a/docker/searchlight/searchlight-api/Dockerfile.j2 b/docker/searchlight/searchlight-api/Dockerfile.j2 index d07c0d1d6b..1f00736da7 100644 --- a/docker/searchlight/searchlight-api/Dockerfile.j2 +++ b/docker/searchlight/searchlight-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}searchlight-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block searchlight_api_header %}{% endblock %} diff --git a/docker/searchlight/searchlight-base/Dockerfile.j2 b/docker/searchlight/searchlight-base/Dockerfile.j2 index 3b69c24e20..24cc2c6085 100644 --- a/docker/searchlight/searchlight-base/Dockerfile.j2 +++ b/docker/searchlight/searchlight-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block searchlight_base_header %}{% endblock %} diff --git a/docker/searchlight/searchlight-listener/Dockerfile.j2 b/docker/searchlight/searchlight-listener/Dockerfile.j2 index 8487efb40d..7331b57ef6 100644 --- a/docker/searchlight/searchlight-listener/Dockerfile.j2 +++ b/docker/searchlight/searchlight-listener/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}searchlight-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block searchlight_listener_header %}{% endblock %} diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2 index a6ac97ba5e..4905cfa993 100644 --- a/docker/senlin/senlin-api/Dockerfile.j2 +++ b/docker/senlin/senlin-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block senlin_api_header %}{% endblock %} diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2 index 5ca5db1cfa..ab53bc39ef 100644 --- a/docker/senlin/senlin-base/Dockerfile.j2 +++ b/docker/senlin/senlin-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block senlin_base_header %}{% endblock %} diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2 index 7a3307d692..d331a8fde4 100644 --- a/docker/senlin/senlin-engine/Dockerfile.j2 +++ b/docker/senlin/senlin-engine/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block senlin_engine_header %}{% endblock %} diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2 index 16e8c61c68..b78210d69d 100644 --- a/docker/solum/solum-api/Dockerfile.j2 +++ b/docker/solum/solum-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block solum_api_header %}{% endblock %} diff --git a/docker/solum/solum-base/Dockerfile.j2 b/docker/solum/solum-base/Dockerfile.j2 index 64c3f56d5c..0a1e15c0b2 100644 --- a/docker/solum/solum-base/Dockerfile.j2 +++ b/docker/solum/solum-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block solum_base_header %}{% endblock %} diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2 index 03f8a38196..d525f08492 100644 --- a/docker/solum/solum-conductor/Dockerfile.j2 +++ b/docker/solum/solum-conductor/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block solum_conductor_header %}{% endblock %} diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2 index 782f2563d2..3b81984097 100644 --- a/docker/solum/solum-deployer/Dockerfile.j2 +++ b/docker/solum/solum-deployer/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block solum_deployer_header %}{% endblock %} diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2 index 6ac2f9b321..cd83cdb811 100644 --- a/docker/solum/solum-worker/Dockerfile.j2 +++ b/docker/solum/solum-worker/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block solum_worker_header %}{% endblock %} diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2 index 936312f236..1a0bccb98f 100644 --- a/docker/swift/swift-account/Dockerfile.j2 +++ b/docker/swift/swift-account/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block swift_account_header %}{% endblock %} diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 895d609bc6..2d0341f8fa 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block swift_base_header %}{% endblock %} diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2 index ad54541c87..f323650df2 100644 --- a/docker/swift/swift-container/Dockerfile.j2 +++ b/docker/swift/swift-container/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block swift_container_header %}{% endblock %} diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index b7f70acf07..c63e59f0f9 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block swift_object_expirer_header %}{% endblock %} diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2 index e9d71231a7..b650415847 100644 --- a/docker/swift/swift-object/Dockerfile.j2 +++ b/docker/swift/swift-object/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block swift_object_header %}{% endblock %} diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 11887d306f..72800e3d84 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block swift_proxy_server_header %}{% endblock %} diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2 index 757b1d15a4..34c6ae844a 100644 --- a/docker/swift/swift-rsyncd/Dockerfile.j2 +++ b/docker/swift/swift-rsyncd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block swift_rsyncd_header %}{% endblock %} diff --git a/docker/tacker/Dockerfile.j2 b/docker/tacker/Dockerfile.j2 index e77264a738..07598c72e0 100644 --- a/docker/tacker/Dockerfile.j2 +++ b/docker/tacker/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block tacker_header %}{% endblock %} diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2 index ba3df8c954..cef92afd50 100644 --- a/docker/telegraf/Dockerfile.j2 +++ b/docker/telegraf/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block telegraf_header %}{% endblock %} diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index 47760d7921..daff5f0d7f 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block tempest_header %}{% endblock %} diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2 index 386c277e34..11cf59a87c 100644 --- a/docker/tgtd/Dockerfile.j2 +++ b/docker/tgtd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block tgtd_header %}{% endblock %} diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index 8506a05497..6c8788ebd1 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block trove_api_header %}{% endblock %} diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index 2682c5a3b1..3f804a2c01 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block trove_base_header %}{% endblock %} diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index 7e807bc27d..894db83cb1 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/docker/trove/trove-conductor/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block trove_conductor_header %}{% endblock %} diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index 5b8409eb8f..09525fdf63 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/docker/trove/trove-guestagent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block trove_guestagent_header %}{% endblock %} diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index 773eb69f46..40de2f3e5e 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/docker/trove/trove-taskmanager/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block trove_taskmanager_header %}{% endblock %} diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2 index 929db5ae44..2c229a5509 100644 --- a/docker/vitrage/vitrage-api/Dockerfile.j2 +++ b/docker/vitrage/vitrage-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block vitrage_api_header %}{% endblock %} diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 index f5886384fc..3a55342761 100644 --- a/docker/vitrage/vitrage-base/Dockerfile.j2 +++ b/docker/vitrage/vitrage-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block vitrage_base_header %}{% endblock %} diff --git a/docker/vitrage/vitrage-graph/Dockerfile.j2 b/docker/vitrage/vitrage-graph/Dockerfile.j2 index 412063fcdb..1ba4ff43b4 100644 --- a/docker/vitrage/vitrage-graph/Dockerfile.j2 +++ b/docker/vitrage/vitrage-graph/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block vitrage_graph_header %}{% endblock %} diff --git a/docker/vitrage/vitrage-notifier/Dockerfile.j2 b/docker/vitrage/vitrage-notifier/Dockerfile.j2 index 8b699de78a..e1ecc86ed0 100644 --- a/docker/vitrage/vitrage-notifier/Dockerfile.j2 +++ b/docker/vitrage/vitrage-notifier/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block vitrage_notifier_header %}{% endblock %} diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2 index 9c85f3a8d7..44b99b85e2 100644 --- a/docker/vmtp/Dockerfile.j2 +++ b/docker/vmtp/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block vmtp_header %}{% endblock %} diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2 index 363462e445..128d227e70 100644 --- a/docker/watcher/watcher-api/Dockerfile.j2 +++ b/docker/watcher/watcher-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block watcher_api_header %}{% endblock %} diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2 index cb92e6e668..0a8244235e 100644 --- a/docker/watcher/watcher-applier/Dockerfile.j2 +++ b/docker/watcher/watcher-applier/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block watcher_applier_header %}{% endblock %} diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2 index 48c0c84736..817888934c 100644 --- a/docker/watcher/watcher-base/Dockerfile.j2 +++ b/docker/watcher/watcher-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block watcher_base_header %}{% endblock %} diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2 index 30f27a1226..b6724815e9 100644 --- a/docker/watcher/watcher-engine/Dockerfile.j2 +++ b/docker/watcher/watcher-engine/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block watcher_engine_header %}{% endblock %} diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2 index e0def2f8b6..b17ffdd083 100755 --- a/docker/zaqar/Dockerfile.j2 +++ b/docker/zaqar/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block zaqar_header %}{% endblock %} diff --git a/docker/zookeeper/Dockerfile.j2 b/docker/zookeeper/Dockerfile.j2 index 64b5ab789d..eb018447b2 100644 --- a/docker/zookeeper/Dockerfile.j2 +++ b/docker/zookeeper/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block zookeeper_header %}{% endblock %} diff --git a/docker/zun/zun-api/Dockerfile.j2 b/docker/zun/zun-api/Dockerfile.j2 index a23e8d67de..2e0fe7503a 100644 --- a/docker/zun/zun-api/Dockerfile.j2 +++ b/docker/zun/zun-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block zun_api_header %}{% endblock %} diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 index fe0e97a08a..0919caaac2 100644 --- a/docker/zun/zun-base/Dockerfile.j2 +++ b/docker/zun/zun-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block zun_base_header %}{% endblock %} diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2 index 7d6fc41fd7..f86d09376e 100644 --- a/docker/zun/zun-compute/Dockerfile.j2 +++ b/docker/zun/zun-compute/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block zun_compute_header %}{% endblock %} diff --git a/releasenotes/notes/MAINTAINER-to-LABEL-344044f33ccfa161.yaml b/releasenotes/notes/MAINTAINER-to-LABEL-344044f33ccfa161.yaml new file mode 100644 index 0000000000..fc1d600669 --- /dev/null +++ b/releasenotes/notes/MAINTAINER-to-LABEL-344044f33ccfa161.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + Following Docker's official guide, the deprecated MAINTAINER instructions + are replaced by the more flexible LABEL instructions in all dockerfiles. diff --git a/tools/validate-maintainer.sh b/tools/validate-maintainer.sh index 455abed10f..c91cda776d 100755 --- a/tools/validate-maintainer.sh +++ b/tools/validate-maintainer.sh @@ -1,6 +1,6 @@ #!/bin/bash -MAINTAINER='MAINTAINER {{ maintainer }}' +MAINTAINER='LABEL maintainer="{{ maintainer }}"' RES=0 for dockerfile in "$@"; do