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/solum | |
| parent | 9751b32a7b37e12fab19a6a99c98c4c58f348a6d (diff) | |
| parent | 31259fa595392c25a5e21d03c13e8896648a7695 (diff) | |
| download | kolla-5841abe910c50d34fbbf4dcfde7b6e92dd82bdae.tar.gz kolla-5841abe910c50d34fbbf4dcfde7b6e92dd82bdae.zip | |
Merge "Override image's meta info."
Diffstat (limited to 'docker/solum')
| -rw-r--r-- | docker/solum/solum-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/solum/solum-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/solum/solum-conductor/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/solum/solum-deployer/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/solum/solum-worker/Dockerfile.j2 | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2 index b78210d69..0373a025f 100644 --- a/docker/solum/solum-api/Dockerfile.j2 +++ b/docker/solum/solum-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block solum_api_header %}{% endblock %} diff --git a/docker/solum/solum-base/Dockerfile.j2 b/docker/solum/solum-base/Dockerfile.j2 index 0a1e15c0b..fed722d78 100644 --- a/docker/solum/solum-base/Dockerfile.j2 +++ b/docker/solum/solum-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 solum_base_header %}{% endblock %} diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2 index d525f0849..7a4765a7d 100644 --- a/docker/solum/solum-conductor/Dockerfile.j2 +++ b/docker/solum/solum-conductor/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block solum_conductor_header %}{% endblock %} diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2 index 3b8198409..eebb436a9 100644 --- a/docker/solum/solum-deployer/Dockerfile.j2 +++ b/docker/solum/solum-deployer/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block solum_deployer_header %}{% endblock %} diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2 index cd83cdb81..9c3147049 100644 --- a/docker/solum/solum-worker/Dockerfile.j2 +++ b/docker/solum/solum-worker/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block solum_worker_header %}{% endblock %} |