diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-06 09:09:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-06 09:09:50 +0200 |
| commit | 43baf49bb8d8e3dc48bdb8d38fb84a065d4d3ce8 (patch) | |
| tree | 40451e8a738297a4b889cba15000fc0b8a1706fb /docs/source/markdown/podman-run.1.md.in | |
| parent | 8882b7664d225bf7f8efac6ab10e8d583e48c712 (diff) | |
| parent | fb38838feafb0d2adae278922da948e52419c9f3 (diff) | |
| download | podman-43baf49bb8d8e3dc48bdb8d38fb84a065d4d3ce8.tar.gz podman-43baf49bb8d8e3dc48bdb8d38fb84a065d4d3ce8.tar.bz2 podman-43baf49bb8d8e3dc48bdb8d38fb84a065d4d3ce8.zip | |
Merge pull request #15636 from edsantiago/docs_dedup_memory
[CI:DOCS] Man pages: refactor common options: --memory*
Diffstat (limited to 'docs/source/markdown/podman-run.1.md.in')
| -rw-r--r-- | docs/source/markdown/podman-run.1.md.in | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/docs/source/markdown/podman-run.1.md.in b/docs/source/markdown/podman-run.1.md.in index a32bf4781..3ad338662 100644 --- a/docs/source/markdown/podman-run.1.md.in +++ b/docs/source/markdown/podman-run.1.md.in @@ -307,15 +307,7 @@ This option is currently supported only by the **journald** log driver. @@option mac-address -#### **--memory**, **-m**=*number[unit]* - -Memory limit. A _unit_ can be **b** (bytes), **k** (kibibytes), **m** (mebibytes), or **g** (gibibytes). - -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 (not using **-m**), the container's memory is -not limited. The actual limit may be rounded up to a multiple of the operating -system's page size (the value would be very large, that's millions of trillions). +@@option memory @@option memory-reservation |