From 1d66ecf0f87d13b827dee612861cddcf09136a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?So=CC=88nmez=20Kartal?= Date: Wed, 10 May 2017 01:43:14 +0300 Subject: [PATCH 1/3] Add deprecation notice for MAINTAINER field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sönmez Kartal --- website/source/docs/builders/docker.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/builders/docker.html.md b/website/source/docs/builders/docker.html.md index e736db197..37fb5c553 100644 --- a/website/source/docs/builders/docker.html.md +++ b/website/source/docs/builders/docker.html.md @@ -97,7 +97,7 @@ Allowed metadata fields that can be changed are: - String, space separated ports - EX: `"EXPOSE 80 443"` - MAINTAINER - - String + - String, deprecated in Docker version 1.13.0 - EX: `"MAINTAINER NAME"` - USER - String From 56ec046fe5e687dc3128d7a5b3ad4cf9dc895e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?So=CC=88nmez=20Kartal?= Date: Wed, 10 May 2017 01:45:26 +0300 Subject: [PATCH 2/3] Add LABEL field to acceptable metadata list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sönmez Kartal --- website/source/docs/builders/docker.html.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/source/docs/builders/docker.html.md b/website/source/docs/builders/docker.html.md index 37fb5c553..842d316a3 100644 --- a/website/source/docs/builders/docker.html.md +++ b/website/source/docs/builders/docker.html.md @@ -74,6 +74,7 @@ Example uses of all of the options, assuming one is building an NGINX image from "ENV HOSTNAME www.example.com", "VOLUME /test1 /test2", "EXPOSE 80 443", + "LABEL version=1.0", "CMD [\"nginx\", \"-g\", \"daemon off;\"]", "MAINTAINER Captain Kirk", "ENTRYPOINT /var/www/start.sh" @@ -96,6 +97,9 @@ Allowed metadata fields that can be changed are: - EXPOSE - String, space separated ports - EX: `"EXPOSE 80 443"` +- LABEL + - String, space separated key=value pairs + - EX: `"LABEL version=1.0"` - MAINTAINER - String, deprecated in Docker version 1.13.0 - EX: `"MAINTAINER NAME"` From b189252f9800c90246e03829f69c6ba2e5d7835a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?So=CC=88nmez=20Kartal?= Date: Wed, 10 May 2017 01:47:04 +0300 Subject: [PATCH 3/3] Add ONBUILD field to acceptable metadata list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sönmez Kartal --- website/source/docs/builders/docker.html.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/source/docs/builders/docker.html.md b/website/source/docs/builders/docker.html.md index 842d316a3..ecfada932 100644 --- a/website/source/docs/builders/docker.html.md +++ b/website/source/docs/builders/docker.html.md @@ -75,6 +75,7 @@ Example uses of all of the options, assuming one is building an NGINX image from "VOLUME /test1 /test2", "EXPOSE 80 443", "LABEL version=1.0", + "ONBUILD RUN date", "CMD [\"nginx\", \"-g\", \"daemon off;\"]", "MAINTAINER Captain Kirk", "ENTRYPOINT /var/www/start.sh" @@ -100,6 +101,9 @@ Allowed metadata fields that can be changed are: - LABEL - String, space separated key=value pairs - EX: `"LABEL version=1.0"` +- ONBUILD + - String + - EX: `"ONBUILD RUN date"` - MAINTAINER - String, deprecated in Docker version 1.13.0 - EX: `"MAINTAINER NAME"`