diff options
| -rw-r--r-- | cmd/podman/common/create.go | 2 | ||||
| -rw-r--r-- | cmd/podman/containers/create.go | 3 | ||||
| -rw-r--r-- | cmd/podman/containers/run.go | 4 | ||||
| -rw-r--r-- | completions/bash/podman | 7 | ||||
| -rw-r--r-- | docs/source/markdown/podman-create.1.md | 6 | ||||
| -rw-r--r-- | docs/source/markdown/podman-pull.1.md | 7 | ||||
| -rw-r--r-- | docs/source/markdown/podman-run.1.md | 6 |
7 files changed, 22 insertions, 13 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index d0bc8d466..df218a026 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -323,13 +323,11 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { "override-arch", "", "use `ARCH` instead of the architecture of the machine for choosing images", ) - // markFlagHidden(createFlags, "override-arch") createFlags.StringVar( &cf.OverrideOS, "override-os", "", "use `OS` instead of the running OS for choosing images", ) - // markFlagHidden(createFlags, "override-os") createFlags.String( "pid", "", "PID namespace to use", diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index 801547033..e29c94352 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -66,9 +66,6 @@ func createFlags(flags *pflag.FlagSet) { _ = flags.MarkHidden("env-host") _ = flags.MarkHidden("http-proxy") } - // Not sure we want these exposed yet. If we do, they need to be documented in man pages - _ = flags.MarkHidden("override-arch") - _ = flags.MarkHidden("override-os") } func init() { diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index a84cb6814..c60095b64 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -70,10 +70,8 @@ func runFlags(flags *pflag.FlagSet) { _ = flags.MarkHidden("http-proxy") _ = flags.MarkHidden("preserve-fds") } - // Not sure we want these exposed yet. If we do, they need to be documented in man pages - _ = flags.MarkHidden("override-arch") - _ = flags.MarkHidden("override-os") } + func init() { registry.Commands = append(registry.Commands, registry.CliCommand{ Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, diff --git a/completions/bash/podman b/completions/bash/podman index ca2c93153..6492da2b3 100644 --- a/completions/bash/podman +++ b/completions/bash/podman @@ -1980,12 +1980,15 @@ _podman_manifest_remove() { _podman_pull() { local options_with_args=" --authfile - --creds --cert-dir + --creds + --override-arch + --override-os " local boolean_options=" --all-tags -a + --disable-content-trust --help -h --quiet @@ -2160,6 +2163,8 @@ _podman_container_run() { --no-healthcheck --no-hosts --oom-score-adj + --override-arch + --override-os --pid --pids-limit --pod 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. |