Merge pull request #32700 from jphuynh/more-maintainer-deprecation

MAINTAINER deprecation follow up. Relates to #25466

builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/Dockerfile

@@ -1,5 +1,5 @@
 FROM	ubuntu:14.04
-MAINTAINER	Seongyeol Lim <seongyeol37@gmail.com>
+LABEL	maintainer	Seongyeol Lim <seongyeol37@gmail.com>
 
 COPY	.	/go/src/github.com/docker/docker
 ADD		.	/

builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/result

@@ -1,5 +1,5 @@
 (from "ubuntu:14.04")
-(maintainer "Seongyeol Lim <seongyeol37@gmail.com>")
+(label "maintainer" "Seongyeol Lim <seongyeol37@gmail.com>")
 (copy "." "/go/src/github.com/docker/docker")
 (add "." "/")
 (add "null" "/")

builder/dockerfile/parser/testfiles/brimstone-consuldock/Dockerfile

@@ -1,7 +1,7 @@
 #escape=\
 FROM brimstone/ubuntu:14.04
 
-MAINTAINER brimstone@the.narro.ws
+LABEL maintainer brimstone@the.narro.ws
 
 # TORUN -v /var/run/docker.sock:/var/run/docker.sock
 

builder/dockerfile/parser/testfiles/brimstone-consuldock/result

@@ -1,5 +1,5 @@
 (from "brimstone/ubuntu:14.04")
-(maintainer "brimstone@the.narro.ws")
+(label "maintainer" "brimstone@the.narro.ws")
 (env "GOPATH" "/go")
 (entrypoint "/usr/local/bin/consuldock")
 (run "apt-get update \t&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean     && apt-get install -y --no-install-recommends git golang ca-certificates     && apt-get clean     && rm -rf /var/lib/apt/lists \t&& go get -v github.com/brimstone/consuldock     && mv $GOPATH/bin/consuldock /usr/local/bin/consuldock \t&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \t&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \t&& rm /tmp/dpkg.* \t&& rm -rf $GOPATH")

builder/dockerfile/parser/testfiles/docker/Dockerfile

@@ -24,7 +24,7 @@
 #
 
 FROM	ubuntu:14.04
-MAINTAINER	Tianon Gravi <admwiggin@gmail.com> (@tianon)
+LABEL	maintainer	Tianon Gravi <admwiggin@gmail.com> (@tianon)
 
 # Packaged dependencies
 RUN	apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \

builder/dockerfile/parser/testfiles/docker/result

@@ -1,5 +1,5 @@
 (from "ubuntu:14.04")
-(maintainer "Tianon Gravi <admwiggin@gmail.com> (@tianon)")
+(label "maintainer" "Tianon Gravi <admwiggin@gmail.com> (@tianon)")
 (run "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \tapt-utils \taufs-tools \tautomake \tbtrfs-tools \tbuild-essential \tcurl \tdpkg-sig \tgit \tiptables \tlibapparmor-dev \tlibcap-dev \tmercurial \tpandoc \tparallel \treprepro \truby1.9.1 \truby1.9.1-dev \ts3cmd=1.1.0* \t--no-install-recommends")
 (run "git clone --no-checkout https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout -q v2_02_103")
 (run "cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper")

builder/dockerfile/parser/testfiles/escape-after-comment/Dockerfile

@@ -4,6 +4,6 @@
 # escape = `
 
 FROM image
-MAINTAINER foo@bar.com
+LABEL maintainer foo@bar.com
 ENV GOPATH \
 \go

builder/dockerfile/parser/testfiles/escape-after-comment/result

@@ -1,3 +1,3 @@
 (from "image")
-(maintainer "foo@bar.com")
+(label "maintainer" "foo@bar.com")
 (env "GOPATH" "\\go")

builder/dockerfile/parser/testfiles/escape-nonewline/Dockerfile

@@ -2,6 +2,6 @@
 # There is no white space line after the directives. This still succeeds, but goes
 # against best practices.
 FROM image
-MAINTAINER foo@bar.com
+LABEL maintainer foo@bar.com
 ENV GOPATH `
 \go

builder/dockerfile/parser/testfiles/escape-nonewline/result

@@ -1,3 +1,3 @@
 (from "image")
-(maintainer "foo@bar.com")
+(label "maintainer" "foo@bar.com")
 (env "GOPATH" "\\go")

builder/dockerfile/parser/testfiles/escape/Dockerfile

@@ -1,6 +1,6 @@
 #escape = `
 
 FROM image
-MAINTAINER foo@bar.com
+LABEL maintainer foo@bar.com
 ENV GOPATH `
 \go

builder/dockerfile/parser/testfiles/escape/result

@@ -1,3 +1,3 @@
 (from "image")
-(maintainer "foo@bar.com")
+(label "maintainer" "foo@bar.com")
 (env "GOPATH" "\\go")

builder/dockerfile/parser/testfiles/escapes/Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:14.04
-MAINTAINER Erik \\Hollensbe <erik@hollensbe.org>\"
+LABEL maintainer Erik \\Hollensbe <erik@hollensbe.org>\"
 
 RUN apt-get \update && \
   apt-get \"install znc -y

builder/dockerfile/parser/testfiles/escapes/result

@@ -1,5 +1,5 @@
 (from "ubuntu:14.04")
-(maintainer "Erik \\\\Hollensbe <erik@hollensbe.org>\\\"")
+(label "maintainer" "Erik \\\\Hollensbe <erik@hollensbe.org>\\\"")
 (run "apt-get \\update &&   apt-get \\\"install znc -y")
 (add "\\conf\\\\\"" "/.znc")
 (run "foo bar baz")

builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:14.04
-MAINTAINER James Turnbull "james@example.com"
+LABEL maintainer James Turnbull "james@example.com"
 ENV REFRESHED_AT 2014-06-01
 RUN apt-get update
 RUN apt-get -y install redis-server redis-tools

builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/result

@@ -1,5 +1,5 @@
 (from "ubuntu:14.04")
-(maintainer "James Turnbull \"james@example.com\"")
+(label "maintainer" "James Turnbull \"james@example.com\"")
 (env "REFRESHED_AT" "2014-06-01")
 (run "apt-get update")
 (run "apt-get -y install redis-server redis-tools")

builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile

@@ -1,6 +1,6 @@
 FROM busybox:buildroot-2014.02
 
-MAINTAINER docker <docker@docker.io>
+LABEL maintainer docker <docker@docker.io>
 
 ONBUILD RUN ["echo", "test"]
 ONBUILD RUN echo test

builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/result

@@ -1,5 +1,5 @@
 (from "busybox:buildroot-2014.02")
-(maintainer "docker <docker@docker.io>")
+(label "maintainer" "docker <docker@docker.io>")
 (onbuild (run "echo" "test"))
 (onbuild (run "echo test"))
 (onbuild (copy "." "/"))

builder/dockerfile/parser/testfiles/nginx/Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:14.04
-MAINTAINER Erik Hollensbe <erik@hollensbe.org>
+LABEL maintainer Erik Hollensbe <erik@hollensbe.org>
 
 RUN apt-get update && apt-get install nginx-full -y
 RUN rm -rf /etc/nginx

builder/dockerfile/parser/testfiles/nginx/result

@@ -1,5 +1,5 @@
 (from "ubuntu:14.04")
-(maintainer "Erik Hollensbe <erik@hollensbe.org>")
+(label "maintainer" "Erik Hollensbe <erik@hollensbe.org>")
 (run "apt-get update && apt-get install nginx-full -y")
 (run "rm -rf /etc/nginx")
 (add "etc" "/etc/nginx")

builder/dockerfile/parser/testfiles/znc/Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:14.04
-MAINTAINER Erik Hollensbe <erik@hollensbe.org>
+LABEL maintainer Erik Hollensbe <erik@hollensbe.org>
 
 RUN apt-get update && apt-get install znc -y
 ADD conf /.znc

builder/dockerfile/parser/testfiles/znc/result

@@ -1,5 +1,5 @@
 (from "ubuntu:14.04")
-(maintainer "Erik Hollensbe <erik@hollensbe.org>")
+(label "maintainer" "Erik Hollensbe <erik@hollensbe.org>")
 (run "apt-get update && apt-get install znc -y")
 (add "conf" "/.znc")
 (cmd "/usr/bin/znc" "-f" "-r")

contrib/desktop-integration/chromium/Dockerfile

@@ -22,7 +22,7 @@
 
 # Base docker image
 FROM debian:jessie
-MAINTAINER Jessica Frazelle <jess@docker.com>
+LABEL maintainer Jessica Frazelle <jess@docker.com>
 
 # Install Chromium
 RUN apt-get update && apt-get install -y \

contrib/desktop-integration/gparted/Dockerfile

@@ -19,7 +19,7 @@
 
 # Base docker image
 FROM debian:jessie
-MAINTAINER Jessica Frazelle <jess@docker.com>
+LABEL maintainer Jessica Frazelle <jess@docker.com>
 
 # Install Gparted and its dependencies
 RUN apt-get update && apt-get install -y \