diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-20 12:32:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-20 12:32:55 +0000 |
| commit | b9e320a7cd23c282494f25ce1c0427dd6201b9b6 (patch) | |
| tree | 54ce933ba2259d22f9d8ac0c8c7efbc0437a23c6 /docker/cinder | |
| parent | 723790fc9f84c130debd0af658471a70b459fd65 (diff) | |
| parent | 8c463a47a9c988df70046f7d343af0441bf29f4d (diff) | |
| download | kolla-b9e320a7cd23c282494f25ce1c0427dd6201b9b6.tar.gz kolla-b9e320a7cd23c282494f25ce1c0427dd6201b9b6.zip | |
Merge "Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2"
Diffstat (limited to 'docker/cinder')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-backup/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-scheduler/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 8121a6b13..a0b0e3ab7 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cinder_api_header %}{% endblock %} diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 6158d46ac..a7284fcd3 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cinder_backup_header %}{% endblock %} diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index f23dee03c..e58cde95b 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cinder_base_header %}{% endblock %} diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index 4c6dcb74c..b521ff706 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cinder_scheduler_header %}{% endblock %} diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index dda916807..2c8e50f12 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cinder_volume_header %}{% endblock %} |