Dockerfile: Switching from MAINTAINER to LABEL.

As per https://docs.docker.com/engine/reference/builder/#/maintainer-deprecated, MAINTAINER <name> should be replaced by LABEL maintainer="name". This patch replace "MAINTAINER" inside the Dockerfile (daemon & daemon-base) by a "LABEL maintainer" entry in __DOCKERFILE_TRACEABILITY_LABELS__ Signed-off-by: Erwan Velu <[email protected]> (cherry picked from commit 6373c6a) Signed-off-by: Sébastien Han <[email protected]>
ceph · Aug 16, 2018 · c03b12c · c03b12c
1 parent 7c0cb7d
commit c03b12c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/ceph-releases/ALL/opensuse/__DOCKERFILE_MAINTAINER__ b/ceph-releases/ALL/opensuse/__DOCKERFILE_MAINTAINER__
@@ -1 +1 @@
-Blaine Gardner "[email protected]"
+Blaine Gardner <[email protected]>
diff --git a/ceph-releases/ALL/rhel7/__DOCKERFILE_MAINTAINER__ b/ceph-releases/ALL/rhel7/__DOCKERFILE_MAINTAINER__
@@ -0,0 +1 @@
+Erwan Velu <[email protected]>
diff --git a/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_PREINSTALL__ b/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_PREINSTALL__
@@ -18,4 +18,3 @@ LABEL description="Red Hat Ceph Storage 3"
 LABEL summary="Provides the latest Red Hat Ceph Storage 3 on RHEL 7 in a fully featured and supported base image."
 LABEL io.k8s.display-name="Red Hat Ceph Storage 3 on RHEL 7"
 LABEL io.openshift.tags="rhceph ceph"
-LABEL maintainer="Erwan Velu <[email protected]>"
diff --git a/src/__DOCKERFILE_TRACEABILITY_LABELS__ b/src/__DOCKERFILE_TRACEABILITY_LABELS__
@@ -1,3 +1,6 @@
+# Who is the maintainer ?
+LABEL maintainer="__DOCKERFILE_MAINTAINER__"
+
 # What is the actual release ? If not defined, this equals the git branch name
 LABEL RELEASE="__ENV_[RELEASE]__"
 

diff --git a/src/daemon-base/Dockerfile b/src/daemon-base/Dockerfile
@@ -1,7 +1,6 @@
 # CEPH DAEMON BASE IMAGE
 
 FROM __ENV_[BASE_IMAGE]__
-MAINTAINER __DOCKERFILE_MAINTAINER__
 
 __DOCKERFILE_TRACEABILITY_LABELS__
 

diff --git a/src/daemon/Dockerfile b/src/daemon/Dockerfile
@@ -1,7 +1,6 @@
 # CEPH DAEMON IMAGE
 
 FROM __ENV_[DAEMON_BASE_IMAGE]__
-MAINTAINER __DOCKERFILE_MAINTAINER__
 
 __DOCKERFILE_TRACEABILITY_LABELS__