Procházet zdrojové kódy

Merge pull request #6680 from mheon/cgroup_memory

Update docker-run manpage
Fred Lifton před 11 roky
rodič
revize
ff20637499
1 změnil soubory, kde provedl 4 přidání a 2 odebrání
  1. 4 2
      docs/man/docker-run.1.md

+ 4 - 2
docs/man/docker-run.1.md

@@ -103,8 +103,10 @@ container can be started with the **--link**.
 **-m**, **-memory**=*memory-limit*
    Allows you to constrain the memory available to a container. If the host
 supports swap memory, then the -m memory setting can be larger than physical
-RAM. If a limit of 0 is specified, the container's memory is not limited. The 
-memory limit format: <number><optional unit>, where unit = b, k, m or g.
+RAM. If a limit of 0 is specified, the container's memory is not limited. The
+actual limit may be rounded up to a multiple of the operating system's page
+size, if it is not already. The memory limit should be formatted as follows:
+`<number><optional unit>`, where unit = b, k, m or g.
 
 **-P**, **-publish-all**=*true*|*false*
    When set to true publish all exposed ports to the host interfaces. The