Merge "Add block labels to all Dockerfiles"

8 files changed, 16 insertions, 0 deletions

diff --git a/docker/monasca/monasca-agent/Dockerfile.j2 b/docker/monasca/monasca-agent/Dockerfile.j2
index b56982a02..24a7f6c96 100644
--- a/docker/monasca/monasca-agent/Dockerfile.j2
+++ b/docker/monasca/monasca-agent/Dockerfile.j2
@@ -1,5 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
+{% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
 
 {% block monasca_agent_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2
index 97c96d95b..e8337fae1 100644
--- a/docker/monasca/monasca-api/Dockerfile.j2
+++ b/docker/monasca/monasca-api/Dockerfile.j2
@@ -1,5 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
+{% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
 
 {% block monasca_api_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2
index aa62f5ee3..fbe6da457 100644
--- a/docker/monasca/monasca-base/Dockerfile.j2
+++ b/docker/monasca/monasca-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 monasca_base_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2
index c296b8b59..e04bb2bb8 100644
--- a/docker/monasca/monasca-grafana/Dockerfile.j2
+++ b/docker/monasca/monasca-grafana/Dockerfile.j2
@@ -1,5 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+{% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
 
 {% block monasca_grafana_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-log-api/Dockerfile.j2 b/docker/monasca/monasca-log-api/Dockerfile.j2
index 94d49408d..696a3f666 100644
--- a/docker/monasca/monasca-log-api/Dockerfile.j2
+++ b/docker/monasca/monasca-log-api/Dockerfile.j2
@@ -1,5 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
+{% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
 
 {% block monasca_log_api_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-notification/Dockerfile.j2 b/docker/monasca/monasca-notification/Dockerfile.j2
index 1e01101c4..e5bf0ea58 100644
--- a/docker/monasca/monasca-notification/Dockerfile.j2
+++ b/docker/monasca/monasca-notification/Dockerfile.j2
@@ -1,5 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
+{% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
 
 {% block monasca_notification_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-persister/Dockerfile.j2 b/docker/monasca/monasca-persister/Dockerfile.j2
index 75c272134..a075ca8f4 100644
--- a/docker/monasca/monasca-persister/Dockerfile.j2
+++ b/docker/monasca/monasca-persister/Dockerfile.j2
@@ -1,5 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
+{% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
 
 {% block monasca_persister_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2
index f76ef50e0..3622f5be5 100644
--- a/docker/monasca/monasca-thresh/Dockerfile.j2
+++ b/docker/monasca/monasca-thresh/Dockerfile.j2
@@ -1,5 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}storm:{{ tag }}
+{% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
 
 USER root