diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-08 21:33:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-08 21:33:04 +0000 |
| commit | 5841abe910c50d34fbbf4dcfde7b6e92dd82bdae (patch) | |
| tree | f36a0b490406bdc99ae5090d2fd782e7dc8fd08e /docker/aodh | |
| parent | 9751b32a7b37e12fab19a6a99c98c4c58f348a6d (diff) | |
| parent | 31259fa595392c25a5e21d03c13e8896648a7695 (diff) | |
| download | kolla-5841abe910c50d34fbbf4dcfde7b6e92dd82bdae.tar.gz kolla-5841abe910c50d34fbbf4dcfde7b6e92dd82bdae.zip | |
Merge "Override image's meta info."
Diffstat (limited to 'docker/aodh')
| -rw-r--r-- | docker/aodh/aodh-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-evaluator/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-expirer/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-listener/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-notifier/Dockerfile.j2 | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 55221dd74..b85483fda 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block aodh_api_header %}{% endblock %} diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index b10cc36dd..32a81588a 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-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 aodh_base_header %}{% endblock %} diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index 60bef0fcf..5b6d13086 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/docker/aodh/aodh-evaluator/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block aodh_evaluator_header %}{% endblock %} diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index e740284c5..1ba8d93b6 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/docker/aodh/aodh-expirer/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block aodh_expirer_header %}{% endblock %} diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index c2889a592..728fd97f4 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/docker/aodh/aodh-listener/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block aodh_listener_header %}{% endblock %} diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index 111de77f6..41a311e01 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/docker/aodh/aodh-notifier/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block aodh_notifier_header %}{% endblock %} |