Merge branch 'master' of https://github.com/aanand/docker into aanand-master

Upstream-commit: da24945070e305e09d4d96d1f981614eaa18b01f Component: engine
2013-11-11 12:34:16 -08:00
parent 223e45f83c a1a49c8919
commit fac387b017
5 changed files with 86 additions and 7 deletions
@@ -652,7 +652,7 @@ network communication.
      -h="": Container host name
      -i=false: Keep stdin open even if not attached
      -privileged=false: Give extended privileges to this container
-      -m=0: Memory limit (in bytes)
+      -m="": Memory limit (format: <number><optional unit>, where unit = b, k, m or g)
      -n=true: Enable networking for this container
      -p=[]: Map a network port to the container
      -rm=false: Automatically remove the container when it exits (incompatible with -d)