From 31259fa595392c25a5e21d03c13e8896648a7695 Mon Sep 17 00:00:00 2001 From: Jawon Choo 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/sahara/sahara-api/Dockerfile.j2 | 2 +- docker/sahara/sahara-base/Dockerfile.j2 | 2 +- docker/sahara/sahara-engine/Dockerfile.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/sahara') diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2 index 7ea5b2149..a2af0fd6c 100644 --- a/docker/sahara/sahara-api/Dockerfile.j2 +++ b/docker/sahara/sahara-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block sahara_api_header %}{% endblock %} diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2 index 5ccaed807..4026a4da9 100644 --- a/docker/sahara/sahara-base/Dockerfile.j2 +++ b/docker/sahara/sahara-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 sahara_base_header %}{% endblock %} diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2 index 01e78a9a1..84866ce9a 100644 --- a/docker/sahara/sahara-engine/Dockerfile.j2 +++ b/docker/sahara/sahara-engine/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block sahara_engine_header %}{% endblock %} -- cgit v1.2.3