diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-15 09:59:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 09:59:18 -0700 |
| commit | 59dd3418f6ee137aa0c2cf678dc9444c5ea0019d (patch) | |
| tree | fe21a48d0dfae11694345a3aaf54072151604ce1 /cmd/podman | |
| parent | e601101e7d93c6c603947db91144ad02f9f9d54b (diff) | |
| parent | ce56202b4525438e2c919e8a56ca49d999387eb7 (diff) | |
| download | podman-59dd3418f6ee137aa0c2cf678dc9444c5ea0019d.tar.gz podman-59dd3418f6ee137aa0c2cf678dc9444c5ea0019d.tar.bz2 podman-59dd3418f6ee137aa0c2cf678dc9444c5ea0019d.zip | |
Merge pull request #6246 from baude/v2remoterun
v2 podman remote attach, start, and run
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/containers/attach.go | 4 | ||||
| -rw-r--r-- | cmd/podman/containers/run.go | 4 | ||||
| -rw-r--r-- | cmd/podman/containers/start.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cmd/podman/containers/attach.go b/cmd/podman/containers/attach.go index 119b47d3f..9f29d1664 100644 --- a/cmd/podman/containers/attach.go +++ b/cmd/podman/containers/attach.go @@ -52,14 +52,14 @@ func attachFlags(flags *pflag.FlagSet) { func init() { registry.Commands = append(registry.Commands, registry.CliCommand{ - Mode: []entities.EngineMode{entities.ABIMode}, + Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, Command: attachCommand, }) flags := attachCommand.Flags() attachFlags(flags) registry.Commands = append(registry.Commands, registry.CliCommand{ - Mode: []entities.EngineMode{entities.ABIMode}, + Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, Command: containerAttachCommand, Parent: containerCmd, }) diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index 5f3ea9ef4..2298691a9 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -66,14 +66,14 @@ func runFlags(flags *pflag.FlagSet) { } func init() { registry.Commands = append(registry.Commands, registry.CliCommand{ - Mode: []entities.EngineMode{entities.ABIMode}, + Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, Command: runCommand, }) flags := runCommand.Flags() runFlags(flags) registry.Commands = append(registry.Commands, registry.CliCommand{ - Mode: []entities.EngineMode{entities.ABIMode}, + Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, Command: containerRunCommand, Parent: containerCmd, }) diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go index ce78d24ed..751fec65f 100644 --- a/cmd/podman/containers/start.go +++ b/cmd/podman/containers/start.go @@ -53,14 +53,14 @@ func startFlags(flags *pflag.FlagSet) { } func init() { registry.Commands = append(registry.Commands, registry.CliCommand{ - Mode: []entities.EngineMode{entities.ABIMode}, + Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, Command: startCommand, }) flags := startCommand.Flags() startFlags(flags) registry.Commands = append(registry.Commands, registry.CliCommand{ - Mode: []entities.EngineMode{entities.ABIMode}, + Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, Command: containerStartCommand, Parent: containerCmd, }) |