From 31259fa595392c25a5e21d03c13e8896648a7695 Mon Sep 17 00:00:00 2001
From: Jawon Choo <jawon.choo@sk.com>
Date: Tue, 2 May 2017 16:23:09 +0900
Subject: Override image's meta info.

centos based images have wrong label info,
these changes fix own image's name and build-date.

Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c
Closes-Bug: #1680341
---
 docker/monasca/monasca-api/Dockerfile.j2          | 2 +-
 docker/monasca/monasca-base/Dockerfile.j2         | 2 +-
 docker/monasca/monasca-log-api/Dockerfile.j2      | 2 +-
 docker/monasca/monasca-notification/Dockerfile.j2 | 2 +-
 docker/monasca/monasca-persister/Dockerfile.j2    | 2 +-
 docker/monasca/monasca-statsd/Dockerfile.j2       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'docker/monasca')

diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2
index 07e26019d..a66c5481a 100644
--- a/docker/monasca/monasca-api/Dockerfile.j2
+++ b/docker/monasca/monasca-api/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block monasca_api_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2
index 6030ede96..1306b578b 100644
--- a/docker/monasca/monasca-base/Dockerfile.j2
+++ b/docker/monasca/monasca-base/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block monasca_base_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-log-api/Dockerfile.j2 b/docker/monasca/monasca-log-api/Dockerfile.j2
index 9077bd7ab..72d3d30f3 100644
--- a/docker/monasca/monasca-log-api/Dockerfile.j2
+++ b/docker/monasca/monasca-log-api/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block monasca_log_api_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-notification/Dockerfile.j2 b/docker/monasca/monasca-notification/Dockerfile.j2
index 7c344683e..1e01101c4 100644
--- a/docker/monasca/monasca-notification/Dockerfile.j2
+++ b/docker/monasca/monasca-notification/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block monasca_notification_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-persister/Dockerfile.j2 b/docker/monasca/monasca-persister/Dockerfile.j2
index 624565f7a..9b8846104 100644
--- a/docker/monasca/monasca-persister/Dockerfile.j2
+++ b/docker/monasca/monasca-persister/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block monasca_persister_header %}{% endblock %}
 
diff --git a/docker/monasca/monasca-statsd/Dockerfile.j2 b/docker/monasca/monasca-statsd/Dockerfile.j2
index aa353e7d3..b549a4077 100644
--- a/docker/monasca/monasca-statsd/Dockerfile.j2
+++ b/docker/monasca/monasca-statsd/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block monasca_api_header %}{% endblock %}
 
-- 
cgit v1.2.3