JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MAINTAINER deprecation follow up. Relates to #25466 

Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>

rewritten from github.com/moby/moby 2c435ab8beba93509b957e4ac5e5801b86b5e8f1
docker-18.09
Jean-Pierre Huynh 2017-04-18 16:44:33 -05:00 committed by Tonis Tiigi
parent b371d95625
commit 2b021f6760
22 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/dockerfile/parser/testfiles/ADD-COPY-with-JSON/Dockerfile
View File

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

2
frontend/dockerfile/parser/testfiles/ADD-COPY-with-JSON/result
View File

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

2
frontend/dockerfile/parser/testfiles/brimstone-consuldock/Dockerfile
View File

@ -1,7 +1,7 @@
#escape=\ #escape=\
FROM brimstone/ubuntu:14.04 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 # TORUN -v /var/run/docker.sock:/var/run/docker.sock

2
frontend/dockerfile/parser/testfiles/brimstone-consuldock/result
View File

@ -1,5 +1,5 @@
(from "brimstone/ubuntu:14.04") (from "brimstone/ubuntu:14.04")
(maintainer "brimstone@the.narro.ws") (label "maintainer" "brimstone@the.narro.ws")
(env "GOPATH" "/go") (env "GOPATH" "/go")
(entrypoint "/usr/local/bin/consuldock") (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") (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")

2
frontend/dockerfile/parser/testfiles/docker/Dockerfile
View File

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

2
frontend/dockerfile/parser/testfiles/docker/result
View File

@ -1,5 +1,5 @@
(from "ubuntu:14.04") (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 "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 "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") (run "cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper")

2
frontend/dockerfile/parser/testfiles/escape-after-comment/Dockerfile
View File

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

2
frontend/dockerfile/parser/testfiles/escape-after-comment/result
View File

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

2
frontend/dockerfile/parser/testfiles/escape-nonewline/Dockerfile
View File

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

2
frontend/dockerfile/parser/testfiles/escape-nonewline/result
View File

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

2
frontend/dockerfile/parser/testfiles/escape/Dockerfile
View File

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

2
frontend/dockerfile/parser/testfiles/escape/result
View File

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

2
frontend/dockerfile/parser/testfiles/escapes/Dockerfile
View File

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

2
frontend/dockerfile/parser/testfiles/escapes/result
View File

@ -1,5 +1,5 @@
(from "ubuntu:14.04") (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") (run "apt-get \\update && apt-get \\\"install znc -y")
(add "\\conf\\\\\"" "/.znc") (add "\\conf\\\\\"" "/.znc")
(run "foo bar baz") (run "foo bar baz")

2
frontend/dockerfile/parser/testfiles/kartar-entrypoint-oddities/Dockerfile
View File

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

2
frontend/dockerfile/parser/testfiles/kartar-entrypoint-oddities/result
View File

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

2
frontend/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile
View File

@ -1,6 +1,6 @@
FROM busybox:buildroot-2014.02 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 RUN echo test ONBUILD RUN echo test

2
frontend/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/result
View File

@ -1,5 +1,5 @@
(from "busybox:buildroot-2014.02") (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 (run "echo test")) (onbuild (run "echo test"))
(onbuild (copy "." "/")) (onbuild (copy "." "/"))

2
frontend/dockerfile/parser/testfiles/nginx/Dockerfile
View File

@ -1,5 +1,5 @@
FROM ubuntu:14.04 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 apt-get update && apt-get install nginx-full -y
RUN rm -rf /etc/nginx RUN rm -rf /etc/nginx

2
frontend/dockerfile/parser/testfiles/nginx/result
View File

@ -1,5 +1,5 @@
(from "ubuntu:14.04") (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 "apt-get update && apt-get install nginx-full -y")
(run "rm -rf /etc/nginx") (run "rm -rf /etc/nginx")
(add "etc" "/etc/nginx") (add "etc" "/etc/nginx")

2
frontend/dockerfile/parser/testfiles/znc/Dockerfile
View File

@ -1,5 +1,5 @@
FROM ubuntu:14.04 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 RUN apt-get update && apt-get install znc -y
ADD conf /.znc ADD conf /.znc

2
frontend/dockerfile/parser/testfiles/znc/result
View File

@ -1,5 +1,5 @@
(from "ubuntu:14.04") (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") (run "apt-get update && apt-get install znc -y")
(add "conf" "/.znc") (add "conf" "/.znc")
(cmd "/usr/bin/znc" "-f" "-r") (cmd "/usr/bin/znc" "-f" "-r")