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/monasca | |
| parent | 9751b32a7b37e12fab19a6a99c98c4c58f348a6d (diff) | |
| parent | 31259fa595392c25a5e21d03c13e8896648a7695 (diff) | |
| download | kolla-5841abe910c50d34fbbf4dcfde7b6e92dd82bdae.tar.gz kolla-5841abe910c50d34fbbf4dcfde7b6e92dd82bdae.zip | |
Merge "Override image's meta info."
Diffstat (limited to 'docker/monasca')
| -rw-r--r-- | docker/monasca/monasca-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/monasca/monasca-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/monasca/monasca-log-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/monasca/monasca-notification/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/monasca/monasca-persister/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/monasca/monasca-statsd/Dockerfile.j2 | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2 index 07e26019d..a66c5481a 100644 --- a/docker/monasca/monasca-api/Dockerfile.j2 +++ b/docker/monasca/monasca-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block monasca_api_header %}{% endblock %} diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2 index 6030ede96..1306b578b 100644 --- a/docker/monasca/monasca-base/Dockerfile.j2 +++ b/docker/monasca/monasca-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 monasca_base_header %}{% endblock %} diff --git a/docker/monasca/monasca-log-api/Dockerfile.j2 b/docker/monasca/monasca-log-api/Dockerfile.j2 index 9077bd7ab..72d3d30f3 100644 --- a/docker/monasca/monasca-log-api/Dockerfile.j2 +++ b/docker/monasca/monasca-log-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block monasca_log_api_header %}{% endblock %} diff --git a/docker/monasca/monasca-notification/Dockerfile.j2 b/docker/monasca/monasca-notification/Dockerfile.j2 index 7c344683e..1e01101c4 100644 --- a/docker/monasca/monasca-notification/Dockerfile.j2 +++ b/docker/monasca/monasca-notification/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block monasca_notification_header %}{% endblock %} diff --git a/docker/monasca/monasca-persister/Dockerfile.j2 b/docker/monasca/monasca-persister/Dockerfile.j2 index 624565f7a..9b8846104 100644 --- a/docker/monasca/monasca-persister/Dockerfile.j2 +++ b/docker/monasca/monasca-persister/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block monasca_persister_header %}{% endblock %} diff --git a/docker/monasca/monasca-statsd/Dockerfile.j2 b/docker/monasca/monasca-statsd/Dockerfile.j2 index aa353e7d3..b549a4077 100644 --- a/docker/monasca/monasca-statsd/Dockerfile.j2 +++ b/docker/monasca/monasca-statsd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block monasca_api_header %}{% endblock %} |