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/ceph | |
| 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/ceph')
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ceph/ceph-mds/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ceph/ceph-mon/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ceph/ceph-osd/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ceph/ceph-rgw/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ceph/cephfs-fuse/Dockerfile.j2 | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 885c8e499..629874843 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceph_base_header %}{% endblock %} diff --git a/docker/ceph/ceph-mds/Dockerfile.j2 b/docker/ceph/ceph-mds/Dockerfile.j2 index 61c64fba0..42f516ee1 100644 --- a/docker/ceph/ceph-mds/Dockerfile.j2 +++ b/docker/ceph/ceph-mds/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceph_mds_header %}{% endblock %} diff --git a/docker/ceph/ceph-mon/Dockerfile.j2 b/docker/ceph/ceph-mon/Dockerfile.j2 index 06ff6bfd4..8b2ed4064 100644 --- a/docker/ceph/ceph-mon/Dockerfile.j2 +++ b/docker/ceph/ceph-mon/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceph_mon_header %}{% endblock %} diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2 index a521189df..6c84bcd95 100644 --- a/docker/ceph/ceph-osd/Dockerfile.j2 +++ b/docker/ceph/ceph-osd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceph_osd_header %}{% endblock %} diff --git a/docker/ceph/ceph-rgw/Dockerfile.j2 b/docker/ceph/ceph-rgw/Dockerfile.j2 index 156ba4956..13b4716cd 100644 --- a/docker/ceph/ceph-rgw/Dockerfile.j2 +++ b/docker/ceph/ceph-rgw/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ceph_rgw_header %}{% endblock %} diff --git a/docker/ceph/cephfs-fuse/Dockerfile.j2 b/docker/ceph/cephfs-fuse/Dockerfile.j2 index d738a73dd..53c7ee45f 100644 --- a/docker/ceph/cephfs-fuse/Dockerfile.j2 +++ b/docker/ceph/cephfs-fuse/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block cephfs_fuse_header %}{% endblock %} |
