diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common/create.go | 12 | ||||
| -rw-r--r-- | cmd/podman/containers/create.go | 5 | ||||
| -rw-r--r-- | cmd/podman/containers/run.go | 4 | ||||
| -rw-r--r-- | cmd/podman/machine/init.go | 2 | ||||
| -rw-r--r-- | cmd/podman/machine/machine.go | 2 | ||||
| -rw-r--r-- | cmd/podman/machine/machine_unsupported.go | 2 | ||||
| -rw-r--r-- | cmd/podman/machine/rm.go | 2 | ||||
| -rw-r--r-- | cmd/podman/machine/ssh.go | 2 | ||||
| -rw-r--r-- | cmd/podman/machine/start.go | 2 | ||||
| -rw-r--r-- | cmd/podman/machine/stop.go | 2 |
10 files changed, 19 insertions, 16 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index d1170710b..dda709ecd 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -765,11 +765,15 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) { ) _ = cmd.RegisterFlagCompletionFunc(mountFlagName, AutocompleteMountFlag) + volumeDesciption := "Bind mount a volume into the container" + if registry.IsRemote() { + volumeDesciption = "Bind mount a volume into the container. Volume src will be on the server machine, not the client" + } volumeFlagName := "volume" createFlags.StringArrayVarP( &cf.Volume, volumeFlagName, "v", volumes(), - "Bind mount a volume into the container", + volumeDesciption, ) _ = cmd.RegisterFlagCompletionFunc(volumeFlagName, AutocompleteVolumeFlag) @@ -804,4 +808,10 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) { "Configure cgroup v2 (key=value)", ) _ = cmd.RegisterFlagCompletionFunc(cgroupConfFlagName, completion.AutocompleteNone) + + _ = createFlags.MarkHidden("signature-policy") + if registry.IsRemote() { + _ = createFlags.MarkHidden("env-host") + _ = createFlags.MarkHidden("http-proxy") + } } diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index af9278ce1..2da9aaf5e 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -63,11 +63,6 @@ func createFlags(cmd *cobra.Command) { common.DefineNetFlags(cmd) flags.SetNormalizeFunc(utils.AliasFlags) - - _ = flags.MarkHidden("signature-policy") - if registry.IsRemote() { - _ = flags.MarkHidden("http-proxy") - } } func init() { diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index db7180ca9..1a9fa2f0f 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -76,13 +76,11 @@ func runFlags(cmd *cobra.Command) { detachKeysFlagName := "detach-keys" flags.StringVar(&runOpts.DetachKeys, detachKeysFlagName, containerConfig.DetachKeys(), "Override the key sequence for detaching a container. Format is a single character `[a-Z]` or a comma separated sequence of `ctrl-<value>`, where `<value>` is one of: `a-cf`, `@`, `^`, `[`, `\\`, `]`, `^` or `_`") _ = cmd.RegisterFlagCompletionFunc(detachKeysFlagName, common.AutocompleteDetachKeys) - - _ = flags.MarkHidden("signature-policy") if registry.IsRemote() { - _ = flags.MarkHidden("http-proxy") _ = flags.MarkHidden("preserve-fds") } } + func init() { registry.Commands = append(registry.Commands, registry.CliCommand{ Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index 05474fd89..61261e008 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -1,4 +1,4 @@ -// +build amd64,linux amd64,darwin arm64,darwin +// +build amd64,linux arm64,linux amd64,darwin arm64,darwin package machine diff --git a/cmd/podman/machine/machine.go b/cmd/podman/machine/machine.go index ed284ee10..9a2377d12 100644 --- a/cmd/podman/machine/machine.go +++ b/cmd/podman/machine/machine.go @@ -1,4 +1,4 @@ -// +build amd64,linux amd64,darwin arm64,darwin +// +build amd64,linux arm64,linux amd64,darwin arm64,darwin package machine diff --git a/cmd/podman/machine/machine_unsupported.go b/cmd/podman/machine/machine_unsupported.go index cb1636419..3bb44b51f 100644 --- a/cmd/podman/machine/machine_unsupported.go +++ b/cmd/podman/machine/machine_unsupported.go @@ -1,4 +1,4 @@ -// +build !amd64 arm64,linux amd64,windows +// +build !amd64 amd64,windows package machine diff --git a/cmd/podman/machine/rm.go b/cmd/podman/machine/rm.go index cd2cc84f2..002a793a3 100644 --- a/cmd/podman/machine/rm.go +++ b/cmd/podman/machine/rm.go @@ -1,4 +1,4 @@ -// +build amd64,linux amd64,darwin arm64,darwin +// +build amd64,linux arm64,linux amd64,darwin arm64,darwin package machine diff --git a/cmd/podman/machine/ssh.go b/cmd/podman/machine/ssh.go index 879122a14..586c4267d 100644 --- a/cmd/podman/machine/ssh.go +++ b/cmd/podman/machine/ssh.go @@ -1,4 +1,4 @@ -// +build amd64,linux amd64,darwin arm64,darwin +// +build amd64,linux arm64,linux amd64,darwin arm64,darwin package machine diff --git a/cmd/podman/machine/start.go b/cmd/podman/machine/start.go index 80fd77102..40800160e 100644 --- a/cmd/podman/machine/start.go +++ b/cmd/podman/machine/start.go @@ -1,4 +1,4 @@ -// +build amd64,linux amd64,darwin arm64,darwin +// +build amd64,linux arm64,linux amd64,darwin arm64,darwin package machine diff --git a/cmd/podman/machine/stop.go b/cmd/podman/machine/stop.go index 4fcb065a3..7d655f0ba 100644 --- a/cmd/podman/machine/stop.go +++ b/cmd/podman/machine/stop.go @@ -1,4 +1,4 @@ -// +build amd64,linux amd64,darwin arm64,darwin +// +build amd64,linux arm64,linux amd64,darwin arm64,darwin package machine |