summaryrefslogtreecommitdiff
path: root/docs/source/markdown/podman-build.1.md.in
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-09-06 09:09:50 +0200
committerGitHub <noreply@github.com>2022-09-06 09:09:50 +0200
commit43baf49bb8d8e3dc48bdb8d38fb84a065d4d3ce8 (patch)
tree40451e8a738297a4b889cba15000fc0b8a1706fb /docs/source/markdown/podman-build.1.md.in
parent8882b7664d225bf7f8efac6ab10e8d583e48c712 (diff)
parentfb38838feafb0d2adae278922da948e52419c9f3 (diff)
downloadpodman-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-build.1.md.in')
-rw-r--r--docs/source/markdown/podman-build.1.md.in23
1 files changed, 2 insertions, 21 deletions
diff --git a/docs/source/markdown/podman-build.1.md.in b/docs/source/markdown/podman-build.1.md.in
index 5b05cc5c9..bc1e03e4c 100644
--- a/docs/source/markdown/podman-build.1.md.in
+++ b/docs/source/markdown/podman-build.1.md.in
@@ -391,28 +391,9 @@ This option is not supported on the remote client, including Mac and Windows
Name of the manifest list to which the image will be added. Creates the manifest list
if it does not exist. This option is useful for building multi architecture images.
-#### **--memory**, **-m**=*LIMIT*
+@@option memory
-Memory limit (format: `<number>[<unit>]`, where unit = 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).
-
-#### **--memory-swap**=*LIMIT*
-
-A limit value equal to memory plus swap. Must be used with the **-m**
-(**--memory**) option. The swap `LIMIT` should always be larger than **-m**
-(**--memory**) value. By default, the swap `LIMIT` will be set to double
-the value of --memory.
-
-The format of `LIMIT` is `<number>[<unit>]`. Unit can be `b` (bytes),
-`k` (kibibytes), `m` (mebibytes), or `g` (gibibytes). If you don't specify a
-unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
+@@option memory-swap
#### **--network**=*mode*, **--net**