diff options
Diffstat (limited to 'docker')
186 files changed, 186 insertions, 186 deletions
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 7332862ca..b420df814 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block aodh_api_header %}{% endblock %} diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index 7f68c5071..519537468 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block aodh_base_header %}{% endblock %} diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index f5e9bc7ba..3d1f6a8b4 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/docker/aodh/aodh-evaluator/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block aodh_evaluator_header %}{% endblock %} diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index 47b1169da..9c426f82c 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/docker/aodh/aodh-expirer/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block aodh_expirer_header %}{% endblock %} diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index 83e010e99..a6f4f3c0e 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/docker/aodh/aodh-listener/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block aodh_listener_header %}{% endblock %} diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index 176c09cee..c49f37441 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/docker/aodh/aodh-notifier/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block aodh_notifier_header %}{% endblock %} diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2 index 2871b994c..e78f3ea63 100644 --- a/docker/barbican/barbican-api/Dockerfile.j2 +++ b/docker/barbican/barbican-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block barbican_api_header %}{% endblock %} diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index b872a37d9..89c44ef9a 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/docker/barbican/barbican-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block barbican_base_header %}{% endblock %} diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/docker/barbican/barbican-keystone-listener/Dockerfile.j2 index 018b6d18d..3329aed1b 100644 --- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 +++ b/docker/barbican/barbican-keystone-listener/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block barbican_keystone_listener_header %}{% endblock %} diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/docker/barbican/barbican-worker/Dockerfile.j2 index 63503f05d..9cba55b6b 100644 --- a/docker/barbican/barbican-worker/Dockerfile.j2 +++ b/docker/barbican/barbican-worker/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block barbican_worker_header %}{% endblock %} diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 3825a2f79..0e2f3c1ab 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ base_image }}:{{ base_distro_tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} RUN . /etc/os-release;\ diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index a84f0e0e3..3e82a9fd3 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block bifrost_base_header %}{% endblock %} diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/docker/bifrost/bifrost-deploy/Dockerfile.j2 index bea702f5e..04fc733fc 100644 --- a/docker/bifrost/bifrost-deploy/Dockerfile.j2 +++ b/docker/bifrost/bifrost-deploy/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}bifrost-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block bifrost_deploy_header %}{% endblock %} diff --git a/docker/blazar/blazar-api/Dockerfile.j2 b/docker/blazar/blazar-api/Dockerfile.j2 index db472a61e..70d6ba22a 100644 --- a/docker/blazar/blazar-api/Dockerfile.j2 +++ b/docker/blazar/blazar-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}blazar-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block blazar_api_header %}{% endblock %} diff --git a/docker/blazar/blazar-base/Dockerfile.j2 b/docker/blazar/blazar-base/Dockerfile.j2 index 98bb0d5ac..433842e41 100644 --- a/docker/blazar/blazar-base/Dockerfile.j2 +++ b/docker/blazar/blazar-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block blazar_base_header %}{% endblock %} diff --git a/docker/blazar/blazar-manager/Dockerfile.j2 b/docker/blazar/blazar-manager/Dockerfile.j2 index 6d0251f38..5cde3db3b 100644 --- a/docker/blazar/blazar-manager/Dockerfile.j2 +++ b/docker/blazar/blazar-manager/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}blazar-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block blazar_manager_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index eb0fc1d02..18bd7600a 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ceilometer_base_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index f702ee647..df96d8ed3 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ceilometer_central_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 48b0ae288..879c4fb01 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ceilometer_compute_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 index d4aef5b7b..a767dc842 100644 --- a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ceilometer_ipmi_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index daf50d8e5..1fc03ffc4 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ceilometer_notification_header %}{% endblock %} diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index f64291d7e..b82fba6d3 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cinder_api_header %}{% endblock %} diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index aaa8a344f..15be355dd 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cinder_backup_header %}{% endblock %} diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index d1f42a18b..bd25d9b18 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cinder_base_header %}{% endblock %} diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index d1835092e..c43792dcc 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cinder_scheduler_header %}{% endblock %} diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index e55b05e44..0e4f38a6e 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cinder_volume_header %}{% endblock %} diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 9d9709bb8..fd3d124f3 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cloudkitty_api_header %}{% endblock %} diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 index a56370936..b545d4adf 100644 --- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cloudkitty_base_header %}{% endblock %} diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 index c2a9d1246..33f30fd33 100644 --- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cloudkitty_processor_header %}{% endblock %} diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index 6849a02bf..32ded377e 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block collectd_header %}{% endblock %} diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2 index 029b65779..d3a9213ac 100644 --- a/docker/cron/Dockerfile.j2 +++ b/docker/cron/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cron_header %}{% endblock %} diff --git a/docker/cyborg/cyborg-agent/Dockerfile.j2 b/docker/cyborg/cyborg-agent/Dockerfile.j2 index 222be13dc..dfc1adc0b 100644 --- a/docker/cyborg/cyborg-agent/Dockerfile.j2 +++ b/docker/cyborg/cyborg-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cyborg_agent_header %}{% endblock %} diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index f087e572d..d67cdeb28 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cyborg_api_header %}{% endblock %} diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 index a0b3a4566..c3f3e602a 100644 --- a/docker/cyborg/cyborg-base/Dockerfile.j2 +++ b/docker/cyborg/cyborg-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cyborg_header %}{% endblock %} diff --git a/docker/cyborg/cyborg-conductor/Dockerfile.j2 b/docker/cyborg/cyborg-conductor/Dockerfile.j2 index aeff1c7ed..d17d1cacd 100644 --- a/docker/cyborg/cyborg-conductor/Dockerfile.j2 +++ b/docker/cyborg/cyborg-conductor/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cyborg_conductor_header %}{% endblock %} diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index c4596b230..6ca9ac180 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block designate_api_header %}{% endblock %} diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index dbf153b53..cf1277aeb 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block designate_backend_bind9_header %}{% endblock %} diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index 35bfa81e9..26a0beca1 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block designate_base_header %}{% endblock %} diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index 229e8336f..81c3c901f 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block designate_central_header %}{% endblock %} diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index c3b4f5b42..dd2e6df75 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block designate_mdns_header %}{% endblock %} diff --git a/docker/designate/designate-producer/Dockerfile.j2 b/docker/designate/designate-producer/Dockerfile.j2 index f21388a05..bd1ce4e1d 100644 --- a/docker/designate/designate-producer/Dockerfile.j2 +++ b/docker/designate/designate-producer/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block designate_producer_header %}{% endblock %} diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 5ddbf9600..8b8e50adf 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block designate_sink_header %}{% endblock %} diff --git a/docker/designate/designate-worker/Dockerfile.j2 b/docker/designate/designate-worker/Dockerfile.j2 index 6aa1cdf7a..b4e190df6 100644 --- a/docker/designate/designate-worker/Dockerfile.j2 +++ b/docker/designate/designate-worker/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block designate_worker_header %}{% endblock %} diff --git a/docker/dnsmasq/Dockerfile.j2 b/docker/dnsmasq/Dockerfile.j2 index fb1fe5db5..882613be7 100644 --- a/docker/dnsmasq/Dockerfile.j2 +++ b/docker/dnsmasq/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block dnsmasq_header %}{% endblock %} diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2 index f9d0c50f4..aafcd8666 100644 --- a/docker/etcd/Dockerfile.j2 +++ b/docker/etcd/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block etcd_header %}{% endblock %} diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 899b4b6d1..c63e1b990 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -3,7 +3,7 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% set fluentd_user = 'fluentd' %} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" fluentd_binary="fluentd" fluentd_user="{{ fluentd_user }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" fluentd_binary="fluentd" fluentd_user="{{ fluentd_user }}" {% endblock %} {% block fluentd_header %}{% endblock %} diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 79289a4bc..e3efbfef3 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block glance_api_header %}{% endblock %} diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index 156d7991a..885cc4353 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block glance_base_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index 53710e078..c0cc2cc33 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block gnocchi_api_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index a050bce8d..91199ac39 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block gnocchi_base_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 index 1c0870084..fe9978fa2 100644 --- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block gnocchi_metricd_header %}{% endblock %} diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 index 73e6dc0c2..8f1574946 100644 --- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block gnocchi_statsd_header %}{% endblock %} diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index 8574aadc8..e401d91b6 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block grafana_header %}{% endblock %} diff --git a/docker/hacluster/hacluster-base/Dockerfile.j2 b/docker/hacluster/hacluster-base/Dockerfile.j2 index 1bcbbfdfd..045f21e1e 100644 --- a/docker/hacluster/hacluster-base/Dockerfile.j2 +++ b/docker/hacluster/hacluster-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block hacluster_base_header %}{% endblock %} diff --git a/docker/hacluster/hacluster-corosync/Dockerfile.j2 b/docker/hacluster/hacluster-corosync/Dockerfile.j2 index 8e8562913..74d47c380 100644 --- a/docker/hacluster/hacluster-corosync/Dockerfile.j2 +++ b/docker/hacluster/hacluster-corosync/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block hacluster_corosync_header %}{% endblock %} diff --git a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 b/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 index da4337a24..64c381e1f 100644 --- a/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block hacluster_pacemaker_remote_header %}{% endblock %} diff --git a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 b/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 index def59ce84..33eeb3144 100644 --- a/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pacemaker/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block hacluster_pacemaker_header %}{% endblock %} diff --git a/docker/hacluster/hacluster-pcs/Dockerfile.j2 b/docker/hacluster/hacluster-pcs/Dockerfile.j2 index 8a57babd3..a146d0d4b 100644 --- a/docker/hacluster/hacluster-pcs/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pcs/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block hacluster_pcs_header %}{% endblock %} diff --git a/docker/haproxy/haproxy-ssh/Dockerfile.j2 b/docker/haproxy/haproxy-ssh/Dockerfile.j2 index c5b8391a4..a674cc75e 100644 --- a/docker/haproxy/haproxy-ssh/Dockerfile.j2 +++ b/docker/haproxy/haproxy-ssh/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block haproxy_ssh_header %}{% endblock %} diff --git a/docker/haproxy/haproxy/Dockerfile.j2 b/docker/haproxy/haproxy/Dockerfile.j2 index 24567679f..36c7ca943 100644 --- a/docker/haproxy/haproxy/Dockerfile.j2 +++ b/docker/haproxy/haproxy/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block haproxy_header %}{% endblock %} diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index b5891b098..db3030c8d 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block heat_api_cfn_header %}{% endblock %} diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 82c0d1e86..af2471279 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block heat_api_header %}{% endblock %} diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index ef275f0d2..a06ea6f0d 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block heat_base_header %}{% endblock %} diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 87a7c8c91..86c943582 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block heat_engine_header %}{% endblock %} diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 86a9f8058..73dc65dd1 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block horizon_header %}{% endblock %} diff --git a/docker/httpd/Dockerfile.j2 b/docker/httpd/Dockerfile.j2 index 98f012f2a..ec5637283 100644 --- a/docker/httpd/Dockerfile.j2 +++ b/docker/httpd/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block apache_header %}{% endblock %} diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index a2406fb83..1c10d0372 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ironic_api_header %}{% endblock %} diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 86f1d7014..e2f7871f6 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ironic_base_header %}{% endblock %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 874a0b81f..bce981fb0 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ironic_conductor_header %}{% endblock %} diff --git a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 index 52a865598..2ac448dfd 100644 --- a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 +++ b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-conductor:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} USER root diff --git a/docker/ironic/ironic-pxe-filter/Dockerfile.j2 b/docker/ironic/ironic-pxe-filter/Dockerfile.j2 index b8bc2cc63..5b593e9f0 100644 --- a/docker/ironic/ironic-pxe-filter/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe-filter/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ironic_pxe_filter_header %}{% endblock %} diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index eb357610b..0475a5b05 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ironic_pxe_header %}{% endblock %} diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index 869b832fa..a1e4bba61 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block iscsid_header %}{% endblock %} diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index 73219912f..2dcdeccd7 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block keepalived_header %}{% endblock %} diff --git a/docker/kerbside/kerbside-api/Dockerfile.j2 b/docker/kerbside/kerbside-api/Dockerfile.j2 index 4e5e1f7a1..6ea99eb7a 100644 --- a/docker/kerbside/kerbside-api/Dockerfile.j2 +++ b/docker/kerbside/kerbside-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}kerbside-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/docker/kerbside/kerbside-base/Dockerfile.j2 b/docker/kerbside/kerbside-base/Dockerfile.j2 index d2e31ca0e..77f881399 100644 --- a/docker/kerbside/kerbside-base/Dockerfile.j2 +++ b/docker/kerbside/kerbside-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block kerbside_base_header %}{% endblock %} diff --git a/docker/kerbside/kerbside-proxy/Dockerfile.j2 b/docker/kerbside/kerbside-proxy/Dockerfile.j2 index 4e5e1f7a1..6ea99eb7a 100644 --- a/docker/kerbside/kerbside-proxy/Dockerfile.j2 +++ b/docker/kerbside/kerbside-proxy/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}kerbside-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 47b37983c..faa424fa7 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block keystone_base_header %}{% endblock %} diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2 index 588b41023..da32ddb86 100644 --- a/docker/keystone/keystone-fernet/Dockerfile.j2 +++ b/docker/keystone/keystone-fernet/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block keystone_fernet_header %}{% endblock %} diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 9cf977ca0..af290bd5f 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block keystone_ssh_header %}{% endblock %} diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 46d60330e..742626c05 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block keystone_header %}{% endblock %} diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index c730c5566..eac78905d 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block kolla_toolbox_header %}{% endblock %} diff --git a/docker/letsencrypt/letsencrypt-base/Dockerfile.j2 b/docker/letsencrypt/letsencrypt-base/Dockerfile.j2 index aa18e482a..8e9e60db9 100644 --- a/docker/letsencrypt/letsencrypt-base/Dockerfile.j2 +++ b/docker/letsencrypt/letsencrypt-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block letsencrypt_base_header %}{% endblock %} diff --git a/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2 b/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2 index 2d7604bdf..b7cda214e 100755 --- a/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2 +++ b/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}letsencrypt-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block letsencrypt_lego_header %}{% endblock %} diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index dc99b1806..304b54e20 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block magnum_api_header %}{% endblock %} diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index 8afb51a21..ac17b94b4 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block magnum_base_header %}{% endblock %} diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 640cf5d99..6e2df8fed 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block magnum_conductor_header %}{% endblock %} diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index 4e13321f5..d7b75d388 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block manila_api_header %}{% endblock %} diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index 83d6ca71d..a236a20df 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block manila_base_header %}{% endblock %} diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index d2d413d94..06e1d9dc9 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block manila_data_header %}{% endblock %} diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2 index cafe36f27..12f7860f4 100644 --- a/docker/manila/manila-scheduler/Dockerfile.j2 +++ b/docker/manila/manila-scheduler/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block manila_scheduler_header %}{% endblock %} diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index 210d8b31c..161b6865a 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block manila_share_header %}{% endblock %} diff --git a/docker/mariadb-server/Dockerfile.j2 b/docker/mariadb-server/Dockerfile.j2 index af9297396..612b37330 100644 --- a/docker/mariadb-server/Dockerfile.j2 +++ b/docker/mariadb-server/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block mariadb_header %}{% endblock %} diff --git a/docker/masakari/masakari-api/Dockerfile.j2 b/docker/masakari/masakari-api/Dockerfile.j2 index ed8c336fc..5285c6a36 100644 --- a/docker/masakari/masakari-api/Dockerfile.j2 +++ b/docker/masakari/masakari-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}masakari-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block masakari_api_header %}{% endblock %} diff --git a/docker/masakari/masakari-base/Dockerfile.j2 b/docker/masakari/masakari-base/Dockerfile.j2 index 7ec23e4e1..97e31247e 100644 --- a/docker/masakari/masakari-base/Dockerfile.j2 +++ b/docker/masakari/masakari-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block masakari_base_header %}{% endblock %} diff --git a/docker/masakari/masakari-engine/Dockerfile.j2 b/docker/masakari/masakari-engine/Dockerfile.j2 index 4ff38b526..8dfb3175c 100644 --- a/docker/masakari/masakari-engine/Dockerfile.j2 +++ b/docker/masakari/masakari-engine/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}masakari-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block masakari_engine_header %}{% endblock %} diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2 index 76ad28d3f..92b8c3947 100644 --- a/docker/masakari/masakari-monitors/Dockerfile.j2 +++ b/docker/masakari/masakari-monitors/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}masakari-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block masakari_monitors_header %}{% endblock %} diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index eea5c5935..dfe90b18e 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block memcached_header %}{% endblock %} diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index 4c6416c82..be3e431e1 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block mistral_api_header %}{% endblock %} diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2 index f7fb3f416..1d72c1cac 100644 --- a/docker/mistral/mistral-base/Dockerfile.j2 +++ b/docker/mistral/mistral-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block mistral_base_header %}{% endblock %} diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2 index 1ccc79d1f..c5fd5eb0d 100644 --- a/docker/mistral/mistral-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-engine/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block mistral_engine_header %}{% endblock %} diff --git a/docker/mistral/mistral-event-engine/Dockerfile.j2 b/docker/mistral/mistral-event-engine/Dockerfile.j2 index c04e1abb8..2a05ecf76 100644 --- a/docker/mistral/mistral-event-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-event-engine/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block mistral_event_engine_header %}{% endblock %} diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2 index 297ed011e..aeae9ed06 100644 --- a/docker/mistral/mistral-executor/Dockerfile.j2 +++ b/docker/mistral/mistral-executor/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block mistral_executor_header %}{% endblock %} diff --git a/docker/multipathd/Dockerfile.j2 b/docker/multipathd/Dockerfile.j2 index e5e2443ce..1341c62a7 100644 --- a/docker/multipathd/Dockerfile.j2 +++ b/docker/multipathd/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block multipathd_header %}{% endblock %} diff --git a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 index 45b9d2b7f..a7ae6ccb4 100644 --- a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 +++ b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ironic_neutron_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 956551fbd..e91c1e6e6 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block neutron_base_header %}{% endblock %} diff --git a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 index 794804483..3ad2ab596 100644 --- a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 +++ b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block neutron_bgp_dragent_header %}{% endblock %} diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 index 7353c2a2d..035433bf2 100644 --- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% 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 2787dae5b..ae0457c18 100644 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block neutron_l3_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 91c308405..3736f70c8 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block neutron_metadata_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2 index a921d8430..e9d7f74e0 100644 --- a/docker/neutron/neutron-metering-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metering-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block neutron_metering_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 index 2ff8e0ff5..4ee89c19a 100644 --- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block neutron_mlnx_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index 4a4cc26a8..b9499e6f7 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block neutron_openvswitch_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-ovn-agent/Dockerfile.j2 b/docker/neutron/neutron-ovn-agent/Dockerfile.j2 index da750fd78..fe4e352ac 100644 --- a/docker/neutron/neutron-ovn-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-ovn-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block neutron_ovn_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-ovn-vpn-agent/Dockerfile.j2 b/docker/neutron/neutron-ovn-vpn-agent/Dockerfile.j2 index e4166c58d..4fbaaa78f 100644 --- a/docker/neutron/neutron-ovn-vpn-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-ovn-vpn-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block neutron_ovn_vpn_agent_header %}{% endblock %} diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 73399eb19..bda0d3dcf 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block neutron_server_header %}{% endblock %} diff --git a/docker/neutron/neutron-sriov-agent/Dockerfile.j2 b/docker/neutron/neutron-sriov-agent/Dockerfile.j2 index 92108fa37..c5d74fbb2 100644 --- a/docker/neutron/neutron-sriov-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-sriov-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block neutron_sriov_agent_header %}{% endblock %} diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 01399edca..57846af79 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block nova_api_header %}{% endblock %} diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index f7ad8f0ad..423a9760a 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block nova_base_header %}{% endblock %} diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index c849dc18f..3c455e2ec 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block nova_compute_ironic_header %}{% endblock %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 8c31461f3..8b3c1bcfe 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block nova_compute_header %}{% endblock %} diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index f91cc76c6..b14000400 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block nova_conductor_header %}{% endblock %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index b866917ea..fb82401b3 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block nova_libvirt_header %}{% endblock %} diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index 208637b9a..4952ed734 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block nova_novncproxy_header %}{% endblock %} diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index 16d8aba10..5b0b0b98e 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block nova_scheduler_header %}{% endblock %} diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2 index 62e859efa..c63e925d5 100644 --- a/docker/nova/nova-serialproxy/Dockerfile.j2 +++ b/docker/nova/nova-serialproxy/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block nova_serialproxy_header %}{% endblock %} diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index fe7a671b4..f3a90b0c5 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block nova_spicehtml5proxy_header %}{% endblock %} diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index a17df28cb..0d9e36b65 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block nova_ssh_header %}{% endblock %} diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/docker/octavia/octavia-api/Dockerfile.j2 index 64e03e01d..ccb7bad11 100644 --- a/docker/octavia/octavia-api/Dockerfile.j2 +++ b/docker/octavia/octavia-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block octavia_api_header %}{% endblock %} diff --git a/docker/octavia/octavia-base/Dockerfile.j2 b/docker/octavia/octavia-base/Dockerfile.j2 index d64ecde2e..81a589a09 100644 --- a/docker/octavia/octavia-base/Dockerfile.j2 +++ b/docker/octavia/octavia-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block octavia_base_header %}{% endblock %} diff --git a/docker/octavia/octavia-driver-agent/Dockerfile.j2 b/docker/octavia/octavia-driver-agent/Dockerfile.j2 index 02f778034..b3519922a 100644 --- a/docker/octavia/octavia-driver-agent/Dockerfile.j2 +++ b/docker/octavia/octavia-driver-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block octavia_driver_agent_header %}{% endblock %} diff --git a/docker/octavia/octavia-health-manager/Dockerfile.j2 b/docker/octavia/octavia-health-manager/Dockerfile.j2 index d45b2340b..1ffbe2050 100644 --- a/docker/octavia/octavia-health-manager/Dockerfile.j2 +++ b/docker/octavia/octavia-health-manager/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block octavia_health_manager_header %}{% endblock %} diff --git a/docker/octavia/octavia-housekeeping/Dockerfile.j2 b/docker/octavia/octavia-housekeeping/Dockerfile.j2 index 3602e1830..775797cca 100644 --- a/docker/octavia/octavia-housekeeping/Dockerfile.j2 +++ b/docker/octavia/octavia-housekeeping/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block octavia_housekeeping_header %}{% endblock %} diff --git a/docker/octavia/octavia-worker/Dockerfile.j2 b/docker/octavia/octavia-worker/Dockerfile.j2 index 4545d7c34..85d4727b7 100644 --- a/docker/octavia/octavia-worker/Dockerfile.j2 +++ b/docker/octavia/octavia-worker/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block octavia_worker_header %}{% endblock %} diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 index 4edf1bf63..3249b62d2 100644 --- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 +++ b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block opensearch_header %}{% endblock %} diff --git a/docker/opensearch/opensearch/Dockerfile.j2 b/docker/opensearch/opensearch/Dockerfile.j2 index 207d42cad..6ad8fb29a 100644 --- a/docker/opensearch/opensearch/Dockerfile.j2 +++ b/docker/opensearch/opensearch/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block opensearch_header %}{% endblock %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 6c53fe587..b8ed2e465 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block openstack_base_header %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 4400d4f1e..44d8df41c 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block openvswitch_base_header %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index 59d701dfb..869dbabb6 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block openvswitch_db_server_header %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index a0f761a83..fe6dd4347 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block openvswitch_vswitchd_header %}{% endblock %} diff --git a/docker/ovn/ovn-base/Dockerfile.j2 b/docker/ovn/ovn-base/Dockerfile.j2 index 0871383d3..3efd001a3 100644 --- a/docker/ovn/ovn-base/Dockerfile.j2 +++ b/docker/ovn/ovn-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ovn_base_header %}{% endblock %} diff --git a/docker/ovn/ovn-controller/Dockerfile.j2 b/docker/ovn/ovn-controller/Dockerfile.j2 index 8dfcb163d..f95e61fee 100644 --- a/docker/ovn/ovn-controller/Dockerfile.j2 +++ b/docker/ovn/ovn-controller/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ovn_controller_header %}{% endblock %} diff --git a/docker/ovn/ovn-nb-db-server/Dockerfile.j2 b/docker/ovn/ovn-nb-db-server/Dockerfile.j2 index 05d99d437..ea6a53249 100644 --- a/docker/ovn/ovn-nb-db-server/Dockerfile.j2 +++ b/docker/ovn/ovn-nb-db-server/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ovn_nb_db_server_header %}{% endblock %} diff --git a/docker/ovn/ovn-northd/Dockerfile.j2 b/docker/ovn/ovn-northd/Dockerfile.j2 index 2d1a873dc..4a15e10eb 100644 --- a/docker/ovn/ovn-northd/Dockerfile.j2 +++ b/docker/ovn/ovn-northd/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ovn_northd_header %}{% endblock %} diff --git a/docker/ovn/ovn-sb-db-relay/Dockerfile.j2 b/docker/ovn/ovn-sb-db-relay/Dockerfile.j2 index d95c7e34c..427b6f7f1 100644 --- a/docker/ovn/ovn-sb-db-relay/Dockerfile.j2 +++ b/docker/ovn/ovn-sb-db-relay/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ovn-sb-db-server:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ovn_sb_db_server_header %}{% endblock %} diff --git a/docker/ovn/ovn-sb-db-server/Dockerfile.j2 b/docker/ovn/ovn-sb-db-server/Dockerfile.j2 index 96d27ce1f..afceb8173 100644 --- a/docker/ovn/ovn-sb-db-server/Dockerfile.j2 +++ b/docker/ovn/ovn-sb-db-server/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ovn_sb_db_server_header %}{% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 index 3b2e99854..2527fa0e6 100644 --- a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ovsdpdk:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ovsdpdk_db_header %}{% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 index 378103b9c..059efd46b 100644 --- a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}ovsdpdk:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block ovsdpdk_vswitchd_header %}{% endblock %} diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 index 47a6d3473..eab4f5474 100644 --- a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% import "macros.j2" as macros with context %} diff --git a/docker/placement/placement-api/Dockerfile.j2 b/docker/placement/placement-api/Dockerfile.j2 index 13654f520..a13f65bdf 100644 --- a/docker/placement/placement-api/Dockerfile.j2 +++ b/docker/placement/placement-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}placement-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block placement_api_header %}{% endblock %} diff --git a/docker/placement/placement-base/Dockerfile.j2 b/docker/placement/placement-base/Dockerfile.j2 index b4d7519db..6454da748 100644 --- a/docker/placement/placement-base/Dockerfile.j2 +++ b/docker/placement/placement-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block placement_base_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 index d06f47dde..8f2df0492 100644 --- a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 +++ b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block prometheus_alertmanager_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-base/Dockerfile.j2 b/docker/prometheus/prometheus-base/Dockerfile.j2 index a8032920c..123bd4ba3 100644 --- a/docker/prometheus/prometheus-base/Dockerfile.j2 +++ b/docker/prometheus/prometheus-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block prometheus_base_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 index cb0b52f62..95018facf 100644 --- a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block prometheus_blackbox_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 index a86183d4b..884f4acd2 100644 --- a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 +++ b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block prometheus_cadvisor_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 index e9dd84f7b..63d09409c 100644 --- a/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block prometheus_elasticsearch_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2 index 57330f58b..c32b2f8c7 100644 --- a/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% import "macros.j2" as macros with context %} diff --git a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 index a4924ec64..cb50c2095 100644 --- a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block prometheus_memcached_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-mtail/Dockerfile.j2 b/docker/prometheus/prometheus-mtail/Dockerfile.j2 index a071bf2a2..a562bfd71 100644 --- a/docker/prometheus/prometheus-mtail/Dockerfile.j2 +++ b/docker/prometheus/prometheus-mtail/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block prometheus_mtail_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 index 5965a6c77..f8d2abaa6 100644 --- a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block mysqld_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 index 7a7eaad67..3250d3d7a 100644 --- a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block node_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 index 547363d30..437f3a6cd 100644 --- a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block prometheus_openstack_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 index 585b96423..3d4d9197b 100644 --- a/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block prometheus_openstack_network_exporter_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-server/Dockerfile.j2 b/docker/prometheus/prometheus-server/Dockerfile.j2 index bcbc3021b..a3b227d7e 100644 --- a/docker/prometheus/prometheus-server/Dockerfile.j2 +++ b/docker/prometheus/prometheus-server/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block prometheus_server_header %}{% endblock %} diff --git a/docker/prometheus/prometheus-valkey-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-valkey-exporter/Dockerfile.j2 index 7f38bae19..c6cf79ac3 100644 --- a/docker/prometheus/prometheus-valkey-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-valkey-exporter/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% import "macros.j2" as macros with context %} diff --git a/docker/proxysql/Dockerfile.j2 b/docker/proxysql/Dockerfile.j2 index 41df913f9..a76dbcda8 100644 --- a/docker/proxysql/Dockerfile.j2 +++ b/docker/proxysql/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block proxysql_header %}{% endblock %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 36feb9c25..a167356a7 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block rabbitmq_header %}{% endblock %} diff --git a/docker/skyline/skyline-apiserver/Dockerfile.j2 b/docker/skyline/skyline-apiserver/Dockerfile.j2 index 00c871165..85b40d51c 100644 --- a/docker/skyline/skyline-apiserver/Dockerfile.j2 +++ b/docker/skyline/skyline-apiserver/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}skyline-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block skyline_apiserver_header %}{% endblock %} diff --git a/docker/skyline/skyline-base/Dockerfile.j2 b/docker/skyline/skyline-base/Dockerfile.j2 index 0af501e55..815fa504f 100644 --- a/docker/skyline/skyline-base/Dockerfile.j2 +++ b/docker/skyline/skyline-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block skyline_base_header %}{% endblock %} diff --git a/docker/skyline/skyline-console/Dockerfile.j2 b/docker/skyline/skyline-console/Dockerfile.j2 index fea06a7b6..ba62f5041 100644 --- a/docker/skyline/skyline-console/Dockerfile.j2 +++ b/docker/skyline/skyline-console/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}skyline-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block skyline_console_header %}{% endblock %} diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2 index 5f66d744a..c24c8d87c 100644 --- a/docker/tacker/tacker-base/Dockerfile.j2 +++ b/docker/tacker/tacker-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block tacker_base_header %}{% endblock %} diff --git a/docker/tacker/tacker-conductor/Dockerfile.j2 b/docker/tacker/tacker-conductor/Dockerfile.j2 index bbabddbe6..676c90106 100644 --- a/docker/tacker/tacker-conductor/Dockerfile.j2 +++ b/docker/tacker/tacker-conductor/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}tacker-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block tacker_conductor_header %}{% endblock %} diff --git a/docker/tacker/tacker-server/Dockerfile.j2 b/docker/tacker/tacker-server/Dockerfile.j2 index 584a23839..659b70bea 100644 --- a/docker/tacker/tacker-server/Dockerfile.j2 +++ b/docker/tacker/tacker-server/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}tacker-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block tacker_server_header %}{% endblock %} diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2 index 0fd9fbfaa..b8cbbaaf5 100644 --- a/docker/tgtd/Dockerfile.j2 +++ b/docker/tgtd/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block tgtd_header %}{% endblock %} diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index 941b79074..8d2885b86 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block trove_api_header %}{% endblock %} diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index 2a3c18880..a675b2b72 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block trove_base_header %}{% endblock %} diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index 16205c55c..4a038c7f9 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/docker/trove/trove-conductor/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block trove_conductor_header %}{% endblock %} diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index a35c96342..178260cae 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/docker/trove/trove-guestagent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block trove_guestagent_header %}{% endblock %} diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index fcd5dbfca..cef0a0ce9 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/docker/trove/trove-taskmanager/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block trove_taskmanager_header %}{% endblock %} diff --git a/docker/valkey/valkey-base/Dockerfile.j2 b/docker/valkey/valkey-base/Dockerfile.j2 index 7d4e6da9a..bc17c0cbb 100644 --- a/docker/valkey/valkey-base/Dockerfile.j2 +++ b/docker/valkey/valkey-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block valkey_base_header %}{% endblock %} diff --git a/docker/valkey/valkey-sentinel/Dockerfile.j2 b/docker/valkey/valkey-sentinel/Dockerfile.j2 index 9cdfac282..94828a38f 100644 --- a/docker/valkey/valkey-sentinel/Dockerfile.j2 +++ b/docker/valkey/valkey-sentinel/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}valkey-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block valkey_sentinel_header %}{% endblock %} diff --git a/docker/valkey/valkey-server/Dockerfile.j2 b/docker/valkey/valkey-server/Dockerfile.j2 index 9d187ffbe..be157d89e 100644 --- a/docker/valkey/valkey-server/Dockerfile.j2 +++ b/docker/valkey/valkey-server/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}valkey-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block valkey_server_header %}{% endblock %} diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2 index ea0f5bb3f..f31b53ecf 100644 --- a/docker/watcher/watcher-api/Dockerfile.j2 +++ b/docker/watcher/watcher-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block watcher_api_header %}{% endblock %} diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2 index 4a332a24a..db28d81d9 100644 --- a/docker/watcher/watcher-applier/Dockerfile.j2 +++ b/docker/watcher/watcher-applier/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block watcher_applier_header %}{% endblock %} diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2 index 97d9eb898..8de6ceb9d 100644 --- a/docker/watcher/watcher-base/Dockerfile.j2 +++ b/docker/watcher/watcher-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block watcher_base_header %}{% endblock %} diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2 index ce018ece4..2518a92b6 100644 --- a/docker/watcher/watcher-engine/Dockerfile.j2 +++ b/docker/watcher/watcher-engine/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block watcher_engine_header %}{% endblock %} |