diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-02 12:26:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-02 12:26:57 +0000 |
| commit | 3fe2ae7849ef963227b1cd46c5b13d646de789c3 (patch) | |
| tree | c194e30e63570fad715b0bcedd8194d238424ab9 /docker/ceilometer | |
| parent | 9c0cfce9f32da87b395c916919bec054d744f311 (diff) | |
| parent | 861f55fbfd7558d56008e6275b0c6f5993346b95 (diff) | |
| download | kolla-3fe2ae7849ef963227b1cd46c5b13d646de789c3.tar.gz kolla-3fe2ae7849ef963227b1cd46c5b13d646de789c3.zip | |
Merge "Add block labels to all Dockerfiles"
Diffstat (limited to 'docker/ceilometer')
5 files changed, 10 insertions, 0 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 10c838215..331a9d203 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ceilometer_base_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index f0341ad88..e0f20d253 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ceilometer_central_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index bd0aa4c6b..ec6239803 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ceilometer_compute_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 index e67e320c0..2614b5c33 100644 --- a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ceilometer_ipmi_header %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 86fad1abf..b4b4be5f2 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block ceilometer_notification_header %}{% endblock %} |