diff --git a/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/Dockerfile b/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/Dockerfile index 00b444cba5..035b4e8bb5 100644 --- a/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/Dockerfile +++ b/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:14.04 -MAINTAINER Seongyeol Lim +LABEL maintainer Seongyeol Lim COPY . /go/src/github.com/docker/docker ADD . / diff --git a/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/result b/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/result index 85aee64018..d1f71ecc5a 100644 --- a/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/result +++ b/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/result @@ -1,5 +1,5 @@ (from "ubuntu:14.04") -(maintainer "Seongyeol Lim ") +(label "maintainer" "Seongyeol Lim ") (copy "." "/go/src/github.com/docker/docker") (add "." "/") (add "null" "/") diff --git a/builder/dockerfile/parser/testfiles/brimstone-consuldock/Dockerfile b/builder/dockerfile/parser/testfiles/brimstone-consuldock/Dockerfile index 0364ef9d96..9c0952acb0 100644 --- a/builder/dockerfile/parser/testfiles/brimstone-consuldock/Dockerfile +++ b/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 diff --git a/builder/dockerfile/parser/testfiles/brimstone-consuldock/result b/builder/dockerfile/parser/testfiles/brimstone-consuldock/result index 227f748cda..3b45db62b4 100644 --- a/builder/dockerfile/parser/testfiles/brimstone-consuldock/result +++ b/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") diff --git a/builder/dockerfile/parser/testfiles/docker/Dockerfile b/builder/dockerfile/parser/testfiles/docker/Dockerfile index b191f7554e..5153453ff3 100644 --- a/builder/dockerfile/parser/testfiles/docker/Dockerfile +++ b/builder/dockerfile/parser/testfiles/docker/Dockerfile @@ -24,7 +24,7 @@ # FROM ubuntu:14.04 -MAINTAINER Tianon Gravi (@tianon) +LABEL maintainer Tianon Gravi (@tianon) # Packaged dependencies RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \ diff --git a/builder/dockerfile/parser/testfiles/docker/result b/builder/dockerfile/parser/testfiles/docker/result index 85011ed411..0c2f229916 100644 --- a/builder/dockerfile/parser/testfiles/docker/result +++ b/builder/dockerfile/parser/testfiles/docker/result @@ -1,5 +1,5 @@ (from "ubuntu:14.04") -(maintainer "Tianon Gravi (@tianon)") +(label "maintainer" "Tianon Gravi (@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") diff --git a/builder/dockerfile/parser/testfiles/escape-after-comment/Dockerfile b/builder/dockerfile/parser/testfiles/escape-after-comment/Dockerfile index 6def7efdcd..18e9a474f2 100644 --- a/builder/dockerfile/parser/testfiles/escape-after-comment/Dockerfile +++ b/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 \ No newline at end of file diff --git a/builder/dockerfile/parser/testfiles/escape-after-comment/result b/builder/dockerfile/parser/testfiles/escape-after-comment/result index 21522a880b..9ab119c414 100644 --- a/builder/dockerfile/parser/testfiles/escape-after-comment/result +++ b/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") diff --git a/builder/dockerfile/parser/testfiles/escape-nonewline/Dockerfile b/builder/dockerfile/parser/testfiles/escape-nonewline/Dockerfile index 08a8cc4326..366ee3c36b 100644 --- a/builder/dockerfile/parser/testfiles/escape-nonewline/Dockerfile +++ b/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 \ No newline at end of file diff --git a/builder/dockerfile/parser/testfiles/escape-nonewline/result b/builder/dockerfile/parser/testfiles/escape-nonewline/result index 21522a880b..9ab119c414 100644 --- a/builder/dockerfile/parser/testfiles/escape-nonewline/result +++ b/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") diff --git a/builder/dockerfile/parser/testfiles/escape/Dockerfile b/builder/dockerfile/parser/testfiles/escape/Dockerfile index ef30414a5e..a515af152d 100644 --- a/builder/dockerfile/parser/testfiles/escape/Dockerfile +++ b/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 \ No newline at end of file diff --git a/builder/dockerfile/parser/testfiles/escape/result b/builder/dockerfile/parser/testfiles/escape/result index 21522a880b..9ab119c414 100644 --- a/builder/dockerfile/parser/testfiles/escape/result +++ b/builder/dockerfile/parser/testfiles/escape/result @@ -1,3 +1,3 @@ (from "image") -(maintainer "foo@bar.com") +(label "maintainer" "foo@bar.com") (env "GOPATH" "\\go") diff --git a/builder/dockerfile/parser/testfiles/escapes/Dockerfile b/builder/dockerfile/parser/testfiles/escapes/Dockerfile index 1ffb17ef08..03062394ae 100644 --- a/builder/dockerfile/parser/testfiles/escapes/Dockerfile +++ b/builder/dockerfile/parser/testfiles/escapes/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:14.04 -MAINTAINER Erik \\Hollensbe \" +LABEL maintainer Erik \\Hollensbe \" RUN apt-get \update && \ apt-get \"install znc -y diff --git a/builder/dockerfile/parser/testfiles/escapes/result b/builder/dockerfile/parser/testfiles/escapes/result index 13e409cb1a..98e3e3b737 100644 --- a/builder/dockerfile/parser/testfiles/escapes/result +++ b/builder/dockerfile/parser/testfiles/escapes/result @@ -1,5 +1,5 @@ (from "ubuntu:14.04") -(maintainer "Erik \\\\Hollensbe \\\"") +(label "maintainer" "Erik \\\\Hollensbe \\\"") (run "apt-get \\update && apt-get \\\"install znc -y") (add "\\conf\\\\\"" "/.znc") (run "foo bar baz") diff --git a/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/Dockerfile b/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/Dockerfile index 35f9c24aa6..728ec9a787 100644 --- a/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/Dockerfile +++ b/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 diff --git a/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/result b/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/result index b5ac6fe445..e774bc4f97 100644 --- a/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/result +++ b/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") diff --git a/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile b/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile index 188395fe83..27f28cb921 100644 --- a/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile +++ b/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile @@ -1,6 +1,6 @@ FROM busybox:buildroot-2014.02 -MAINTAINER docker +LABEL maintainer docker ONBUILD RUN ["echo", "test"] ONBUILD RUN echo test diff --git a/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/result b/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/result index 6f7d57a396..8a499ff948 100644 --- a/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/result +++ b/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/result @@ -1,5 +1,5 @@ (from "busybox:buildroot-2014.02") -(maintainer "docker ") +(label "maintainer" "docker ") (onbuild (run "echo" "test")) (onbuild (run "echo test")) (onbuild (copy "." "/")) diff --git a/builder/dockerfile/parser/testfiles/nginx/Dockerfile b/builder/dockerfile/parser/testfiles/nginx/Dockerfile index bf8368e1ca..0a35e2c6b2 100644 --- a/builder/dockerfile/parser/testfiles/nginx/Dockerfile +++ b/builder/dockerfile/parser/testfiles/nginx/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:14.04 -MAINTAINER Erik Hollensbe +LABEL maintainer Erik Hollensbe RUN apt-get update && apt-get install nginx-full -y RUN rm -rf /etc/nginx diff --git a/builder/dockerfile/parser/testfiles/nginx/result b/builder/dockerfile/parser/testfiles/nginx/result index 56ddb6f258..a895fadbbe 100644 --- a/builder/dockerfile/parser/testfiles/nginx/result +++ b/builder/dockerfile/parser/testfiles/nginx/result @@ -1,5 +1,5 @@ (from "ubuntu:14.04") -(maintainer "Erik Hollensbe ") +(label "maintainer" "Erik Hollensbe ") (run "apt-get update && apt-get install nginx-full -y") (run "rm -rf /etc/nginx") (add "etc" "/etc/nginx") diff --git a/builder/dockerfile/parser/testfiles/znc/Dockerfile b/builder/dockerfile/parser/testfiles/znc/Dockerfile index 3a4da6e916..626b126d8a 100644 --- a/builder/dockerfile/parser/testfiles/znc/Dockerfile +++ b/builder/dockerfile/parser/testfiles/znc/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:14.04 -MAINTAINER Erik Hollensbe +LABEL maintainer Erik Hollensbe RUN apt-get update && apt-get install znc -y ADD conf /.znc diff --git a/builder/dockerfile/parser/testfiles/znc/result b/builder/dockerfile/parser/testfiles/znc/result index 5493b255fd..bfc7f65135 100644 --- a/builder/dockerfile/parser/testfiles/znc/result +++ b/builder/dockerfile/parser/testfiles/znc/result @@ -1,5 +1,5 @@ (from "ubuntu:14.04") -(maintainer "Erik Hollensbe ") +(label "maintainer" "Erik Hollensbe ") (run "apt-get update && apt-get install znc -y") (add "conf" "/.znc") (cmd "/usr/bin/znc" "-f" "-r") diff --git a/contrib/desktop-integration/chromium/Dockerfile b/contrib/desktop-integration/chromium/Dockerfile index 5cacd1f999..187281644f 100644 --- a/contrib/desktop-integration/chromium/Dockerfile +++ b/contrib/desktop-integration/chromium/Dockerfile @@ -22,7 +22,7 @@ # Base docker image FROM debian:jessie -MAINTAINER Jessica Frazelle +LABEL maintainer Jessica Frazelle # Install Chromium RUN apt-get update && apt-get install -y \ diff --git a/contrib/desktop-integration/gparted/Dockerfile b/contrib/desktop-integration/gparted/Dockerfile index 3ddb23208d..8a9b646ee4 100644 --- a/contrib/desktop-integration/gparted/Dockerfile +++ b/contrib/desktop-integration/gparted/Dockerfile @@ -19,7 +19,7 @@ # Base docker image FROM debian:jessie -MAINTAINER Jessica Frazelle +LABEL maintainer Jessica Frazelle # Install Gparted and its dependencies RUN apt-get update && apt-get install -y \