aboutsummaryrefslogtreecommitdiff
path: root/docker/aodh
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-03-02 12:26:57 +0000
committerGerrit Code Review <review@openstack.org>2020-03-02 12:26:57 +0000
commit3fe2ae7849ef963227b1cd46c5b13d646de789c3 (patch)
treec194e30e63570fad715b0bcedd8194d238424ab9 /docker/aodh
parent9c0cfce9f32da87b395c916919bec054d744f311 (diff)
parent861f55fbfd7558d56008e6275b0c6f5993346b95 (diff)
downloadkolla-3fe2ae7849ef963227b1cd46c5b13d646de789c3.tar.gz
kolla-3fe2ae7849ef963227b1cd46c5b13d646de789c3.zip
Merge "Add block labels to all Dockerfiles"
Diffstat (limited to 'docker/aodh')
-rw-r--r--docker/aodh/aodh-api/Dockerfile.j22
-rw-r--r--docker/aodh/aodh-base/Dockerfile.j22
-rw-r--r--docker/aodh/aodh-evaluator/Dockerfile.j22
-rw-r--r--docker/aodh/aodh-expirer/Dockerfile.j22
-rw-r--r--docker/aodh/aodh-listener/Dockerfile.j22
-rw-r--r--docker/aodh/aodh-notifier/Dockerfile.j22
6 files changed, 12 insertions, 0 deletions
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2
index 01ac126ad..13f08f53a 100644
--- a/docker/aodh/aodh-api/Dockerfile.j2
+++ b/docker/aodh/aodh-api/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block aodh_api_header %}{% endblock %}
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2
index 900225e7f..23c1b4608 100644
--- a/docker/aodh/aodh-base/Dockerfile.j2
+++ b/docker/aodh/aodh-base/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block aodh_base_header %}{% endblock %}
diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2
index 3e06be46a..7420c96ab 100644
--- a/docker/aodh/aodh-evaluator/Dockerfile.j2
+++ b/docker/aodh/aodh-evaluator/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block aodh_evaluator_header %}{% endblock %}
diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2
index 6b1d8400d..278f3ab0e 100644
--- a/docker/aodh/aodh-expirer/Dockerfile.j2
+++ b/docker/aodh/aodh-expirer/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block aodh_expirer_header %}{% endblock %}
diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2
index fef7b81ce..2cc890b68 100644
--- a/docker/aodh/aodh-listener/Dockerfile.j2
+++ b/docker/aodh/aodh-listener/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block aodh_listener_header %}{% endblock %}
diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2
index 7ecdb64f5..14cd1550c 100644
--- a/docker/aodh/aodh-notifier/Dockerfile.j2
+++ b/docker/aodh/aodh-notifier/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block aodh_notifier_header %}{% endblock %}