Merge branch 'master' into 1167_events_endpoint-feature

This commit is contained in:
Victor Vieux
2013-07-24 11:49:04 +00:00
9 changed files with 132 additions and 44 deletions
+1
View File
@@ -20,6 +20,7 @@
-h="": Container host name
-i=false: Keep stdin open even if not attached
-m=0: Memory limit (in bytes)
-n=true: Enable networking for this container
-p=[]: Map a network port to the container
-t=false: Allocate a pseudo-tty
-u="": Username or UID
+1 -1
View File
@@ -187,7 +187,7 @@ The copy obeys the following rules:
3.8 ENTRYPOINT
--------------
``ENTRYPOINT /bin/echo``
``ENTRYPOINT ["/bin/echo"]``
The ``ENTRYPOINT`` instruction adds an entry command that will not be
overwritten when arguments are passed to docker run, unlike the