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/heat/heat-all/Dockerfile.j2            | 2 +-
 docker/heat/heat-api-cfn/Dockerfile.j2        | 2 +-
 docker/heat/heat-api-cloudwatch/Dockerfile.j2 | 2 +-
 docker/heat/heat-api/Dockerfile.j2            | 2 +-
 docker/heat/heat-base/Dockerfile.j2           | 2 +-
 docker/heat/heat-engine/Dockerfile.j2         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'docker/heat')

diff --git a/docker/heat/heat-all/Dockerfile.j2 b/docker/heat/heat-all/Dockerfile.j2
index afe73dc5b..eb2698c11 100644
--- a/docker/heat/heat-all/Dockerfile.j2
+++ b/docker/heat/heat-all/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block heat_all_header %}{% endblock %}
 
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index c3567080f..8fdb4bb7b 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block heat_api_cfn_header %}{% endblock %}
 
diff --git a/docker/heat/heat-api-cloudwatch/Dockerfile.j2 b/docker/heat/heat-api-cloudwatch/Dockerfile.j2
index a168c8726..1eb18223f 100644
--- a/docker/heat/heat-api-cloudwatch/Dockerfile.j2
+++ b/docker/heat/heat-api-cloudwatch/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block heat_api_cloudwatch_header %}{% endblock %}
 
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 7a7de552f..40b06fb27 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block heat_api_header %}{% endblock %}
 
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index de3660f62..f48d8281e 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-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 heat_base_header %}{% endblock %}
 
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2
index 0b4fc5fbf..64c642fa9 100644
--- a/docker/heat/heat-engine/Dockerfile.j2
+++ b/docker/heat/heat-engine/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block heat_engine_header %}{% endblock %}
 
-- 
cgit v1.2.3