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/swift/swift-account/Dockerfile.j2        | 2 +-
 docker/swift/swift-base/Dockerfile.j2           | 2 +-
 docker/swift/swift-container/Dockerfile.j2      | 2 +-
 docker/swift/swift-object-expirer/Dockerfile.j2 | 2 +-
 docker/swift/swift-object/Dockerfile.j2         | 2 +-
 docker/swift/swift-proxy-server/Dockerfile.j2   | 2 +-
 docker/swift/swift-rsyncd/Dockerfile.j2         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'docker/swift')

diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2
index 1a0bccb98..1c09a5228 100644
--- a/docker/swift/swift-account/Dockerfile.j2
+++ b/docker/swift/swift-account/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block swift_account_header %}{% endblock %}
 
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 2d0341f8f..929b77f94 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-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 swift_base_header %}{% endblock %}
 
diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2
index f323650df..74ba26189 100644
--- a/docker/swift/swift-container/Dockerfile.j2
+++ b/docker/swift/swift-container/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block swift_container_header %}{% endblock %}
 
diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2
index c63e59f0f..ef1d8b2f5 100644
--- a/docker/swift/swift-object-expirer/Dockerfile.j2
+++ b/docker/swift/swift-object-expirer/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block swift_object_expirer_header %}{% endblock %}
 
diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2
index b65041584..796a1dcc4 100644
--- a/docker/swift/swift-object/Dockerfile.j2
+++ b/docker/swift/swift-object/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block swift_object_header %}{% endblock %}
 
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index 72800e3d8..e13c6c58c 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block swift_proxy_server_header %}{% endblock %}
 
diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2
index 34c6ae844..cbbeb5d94 100644
--- a/docker/swift/swift-rsyncd/Dockerfile.j2
+++ b/docker/swift/swift-rsyncd/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block swift_rsyncd_header %}{% endblock %}
 
-- 
cgit v1.2.3