From 8c463a47a9c988df70046f7d343af0441bf29f4d Mon Sep 17 00:00:00 2001 From: Chen Date: Tue, 18 Apr 2017 17:20:03 +0900 Subject: Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2 Use LABEL instruction instead of MAINTAINER (deprecated) instruc- tion as suggested by Docker's official dockerfile guide. docs.docker.com/engine/reference/builder/#maintainer-deprecated Closes-Bug: #1683652 Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898 --- docker/ceph/ceph-base/Dockerfile.j2 | 2 +- docker/ceph/ceph-mds/Dockerfile.j2 | 2 +- docker/ceph/ceph-mon/Dockerfile.j2 | 2 +- docker/ceph/ceph-osd/Dockerfile.j2 | 2 +- docker/ceph/ceph-rgw/Dockerfile.j2 | 2 +- docker/ceph/cephfs-fuse/Dockerfile.j2 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docker/ceph') 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 %} -- cgit v1.2.3