summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authoropenshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com>2022-07-03 20:13:51 +0000
committerGitHub <noreply@github.com>2022-07-03 20:13:51 +0000
commit73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6 (patch)
tree5db98fc07babcc3b1a1f5bb71252edf6b939096f /docs
parentfd33ab09365994ba4625f238c88474a4167ede66 (diff)
parentb92149e2a8ce596b2839ec404e2ebd457943848f (diff)
downloadpodman-73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6.tar.gz
podman-73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6.tar.bz2
podman-73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6.zip
Merge pull request #14802 from cdoern/podMemory
podman pod create --memory
Diffstat (limited to 'docs')
-rw-r--r--docs/source/markdown/podman-pod-clone.1.md10
-rw-r--r--docs/source/markdown/podman-pod-create.1.md10
2 files changed, 20 insertions, 0 deletions
diff --git a/docs/source/markdown/podman-pod-clone.1.md b/docs/source/markdown/podman-pod-clone.1.md
index e44e9fa3c..207f59838 100644
--- a/docs/source/markdown/podman-pod-clone.1.md
+++ b/docs/source/markdown/podman-pod-clone.1.md
@@ -80,6 +80,16 @@ Add metadata to a pod (e.g., --label com.example.key=value).
Read in a line delimited file of labels.
+#### **--memory**, **-m**=*limit*
+
+Memory limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kibibytes), m (mebibytes), or g (gibibytes))
+
+Constrains 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).
+
#### **--name**, **-n**
Set a custom name for the cloned pod. The default if not specified is of the syntax: **<ORIGINAL_NAME>-clone**
diff --git a/docs/source/markdown/podman-pod-create.1.md b/docs/source/markdown/podman-pod-create.1.md
index e63623169..e5899d808 100644
--- a/docs/source/markdown/podman-pod-create.1.md
+++ b/docs/source/markdown/podman-pod-create.1.md
@@ -164,6 +164,16 @@ according to RFC4862.
To specify multiple static MAC addresses per pod, set multiple networks using the **--network** option with a static MAC address specified for each using the `mac` mode for that option.
+#### **--memory**, **-m**=*limit*
+
+Memory limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kibibytes), m (mebibytes), or g (gibibytes))
+
+Constrains 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).
+
#### **--name**=*name*, **-n**