diff --git a/ceph-releases/ALL/opensuse/__DOCKERFILE_MAINTAINER__ b/ceph-releases/ALL/opensuse/__DOCKERFILE_MAINTAINER__ index 6b86918ec..67ffde3f9 100644 --- a/ceph-releases/ALL/opensuse/__DOCKERFILE_MAINTAINER__ +++ b/ceph-releases/ALL/opensuse/__DOCKERFILE_MAINTAINER__ @@ -1 +1 @@ -Blaine Gardner "blaine.gardner@suse.com" +Blaine Gardner diff --git a/ceph-releases/ALL/rhel7/__DOCKERFILE_MAINTAINER__ b/ceph-releases/ALL/rhel7/__DOCKERFILE_MAINTAINER__ new file mode 100644 index 000000000..07bb0c894 --- /dev/null +++ b/ceph-releases/ALL/rhel7/__DOCKERFILE_MAINTAINER__ @@ -0,0 +1 @@ +Erwan Velu diff --git a/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_PREINSTALL__ b/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_PREINSTALL__ index 26c7b080c..93f7e13fa 100644 --- 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 " diff --git a/src/__DOCKERFILE_TRACEABILITY_LABELS__ b/src/__DOCKERFILE_TRACEABILITY_LABELS__ index 967e5ab0e..d65a45409 100644 --- 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 index 583da3950..c83726f16 100644 --- 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 index 8997b10a7..9c6d6e01e 100644 --- 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__