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/ceilometer/ceilometer-api/Dockerfile.j2          | 2 +-
 docker/ceilometer/ceilometer-base/Dockerfile.j2         | 2 +-
 docker/ceilometer/ceilometer-central/Dockerfile.j2      | 2 +-
 docker/ceilometer/ceilometer-collector/Dockerfile.j2    | 2 +-
 docker/ceilometer/ceilometer-compute/Dockerfile.j2      | 2 +-
 docker/ceilometer/ceilometer-notification/Dockerfile.j2 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'docker/ceilometer')

diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2
index a44552099..be6ae4b37 100644
--- a/docker/ceilometer/ceilometer-api/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceilometer_api_header %}{% endblock %}
 
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 3141eabc5..584170a09 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-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 ceilometer_base_header %}{% endblock %}
 
diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2
index 627034f2d..f8c459959 100644
--- a/docker/ceilometer/ceilometer-central/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceilometer_central_header %}{% endblock %}
 
diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
index 8e03b26c5..9a7f3dc2e 100644
--- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceilometer_collector_header %}{% endblock %}
 
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index 0ed8d26c9..4c07f2135 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceilometer_compute_header %}{% endblock %}
 
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
index 28b1d2a81..64e1c4b01 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block ceilometer_notification_header %}{% endblock %}
 
-- 
cgit v1.2.3