diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2020-08-24 15:45:31 -0400 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-08-28 09:35:13 -0400 |
commit | f49b98c61019ac04dccd6b3d5bc0c6af7857b17e (patch) | |
tree | 9338aea3a9e8883cd8932f3970c8480e8772ec6d /cmd/podman | |
parent | e3edb7ba9dd8d079b09d2effda365a1b51d303e7 (diff) | |
download | podman-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 'cmd/podman')
-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 |
3 files changed, 1 insertions, 8 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}, |