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/keystone/keystone-base/Dockerfile.j2 | 2 +- docker/keystone/keystone-fernet/Dockerfile.j2 | 2 +- docker/keystone/keystone-ssh/Dockerfile.j2 | 2 +- docker/keystone/keystone/Dockerfile.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docker/keystone') diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 45d448440..d22c01b76 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-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 keystone_base_header %}{% endblock %} diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2 index 16ae8ead0..f06751509 100644 --- a/docker/keystone/keystone-fernet/Dockerfile.j2 +++ b/docker/keystone/keystone-fernet/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block keystone_fernet_header %}{% endblock %} diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 6b93fdc1d..6898c2e6e 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block keystone_ssh_header %}{% endblock %} diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 8a0c94095..26745fee6 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block keystone_header %}{% endblock %} -- cgit v1.2.3