Merge pull request #4867 from szkl/website-builder-docker-changes

Update docker metadata fields that can be changed

website/source/docs/builders/docker.html.md

@@ -74,6 +74,8 @@ 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",
+    "ONBUILD RUN date",
     "CMD [\"nginx\", \"-g\", \"daemon off;\"]",
     "MAINTAINER Captain Kirk",
     "ENTRYPOINT /var/www/start.sh"
@@ -96,8 +98,14 @@ Allowed metadata fields that can be changed are:
 - EXPOSE
 	- String, space separated ports
 	- EX: `"EXPOSE 80 443"`
-- MAINTAINER
+- 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"`
 - USER
 	- String