summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-08-24 15:45:31 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-08-28 09:35:13 -0400
commitf49b98c61019ac04dccd6b3d5bc0c6af7857b17e (patch)
tree9338aea3a9e8883cd8932f3970c8480e8772ec6d /docs
parente3edb7ba9dd8d079b09d2effda365a1b51d303e7 (diff)
downloadpodman-f49b98c61019ac04dccd6b3d5bc0c6af7857b17e.tar.gz
podman-f49b98c61019ac04dccd6b3d5bc0c6af7857b17e.tar.bz2
podman-f49b98c61019ac04dccd6b3d5bc0c6af7857b17e.zip
Document override-arch and override-os
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/source/markdown/podman-create.1.md6
-rw-r--r--docs/source/markdown/podman-pull.1.md7
-rw-r--r--docs/source/markdown/podman-run.1.md6
3 files changed, 15 insertions, 4 deletions
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md
index 2f59f8a09..bc195aa39 100644
--- a/docs/source/markdown/podman-create.1.md
+++ b/docs/source/markdown/podman-create.1.md
@@ -599,6 +599,12 @@ Whether to disable OOM Killer for the container or not.
Tune the host's OOM preferences for containers (accepts -1000 to 1000)
+**--override-arch**=*ARCH*
+Override the machine's default architecture of the image to be pulled. For example, `arm`.
+
+**--override-os**=*OS*
+Use OS instead of the running OS for choosing images
+
**--pid**=*pid*
Set the PID mode for the container
diff --git a/docs/source/markdown/podman-pull.1.md b/docs/source/markdown/podman-pull.1.md
index 201b10aa6..f209209a9 100644
--- a/docs/source/markdown/podman-pull.1.md
+++ b/docs/source/markdown/podman-pull.1.md
@@ -79,13 +79,12 @@ This is a Docker specific option to disable image verification to a Docker
registry and is not supported by Podman. This flag is a NOOP and provided
solely for scripting compatibility.
-**--override-os**=*OS*
-Use OS instead of the running OS for choosing images
-
**--override-arch**=*ARCH*
-
Override the machine's default architecture of the image to be pulled. For example, `arm`.
+**--override-os**=*OS*
+Use OS instead of the running OS for choosing images
+
**--quiet**, **-q**
Suppress output information when pulling images
diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
index c86090167..b0afcecfa 100644
--- a/docs/source/markdown/podman-run.1.md
+++ b/docs/source/markdown/podman-run.1.md
@@ -608,6 +608,12 @@ Whether to disable OOM Killer for the container or not.
Tune the host's OOM preferences for containers (accepts values from **-1000** to **1000**).
+**--override-arch**=*ARCH*
+Override the machine's default architecture of the image to be pulled. For example, `arm`.
+
+**--override-os**=*OS*
+Use OS instead of the running OS for choosing images
+
**--pid**=*mode*
Set the PID namespace mode for the container.