From 860356970b0be5a38cb2714c2ad081972c846814 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Tue, 21 Apr 2020 10:46:23 -0500 Subject: my bad typos in previous pr are causing panics Signed-off-by: Brent Baude --- cmd/podman/containers/attach.go | 17 ----------------- cmd/podman/containers/commit.go | 2 +- cmd/podman/containers/run.go | 4 ++-- cmd/podman/containers/start.go | 2 +- 4 files changed, 4 insertions(+), 21 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/containers/attach.go b/cmd/podman/containers/attach.go index b87fab5ef..78b52ad1b 100644 --- a/cmd/podman/containers/attach.go +++ b/cmd/podman/containers/attach.go @@ -43,23 +43,6 @@ var ( attachOpts entities.AttachOptions ) -func init() { - registry.Commands = append(registry.Commands, registry.CliCommand{ - Mode: []entities.EngineMode{entities.ABIMode}, - Command: attachCommand, - }) - flags := attachCommand.Flags() - attachFlags(flags) - - registry.Commands = append(registry.Commands, registry.CliCommand{ - Mode: []entities.EngineMode{entities.ABIMode}, - Command: containerAttachCommand, - Parent: containerCmd, - }) - containerAttachFlags := containerAttachCommand.Flags() - attachFlags(containerAttachFlags) -} - func attachFlags(flags *pflag.FlagSet) { flags.StringVar(&attachOpts.DetachKeys, "detach-keys", containerConfig.DetachKeys(), "Select the key sequence for detaching a container. Format is a single character `[a-Z]` or a comma separated sequence of `ctrl-`, where `` is one of: `a-z`, `@`, `^`, `[`, `\\`, `]`, `^` or `_`") flags.BoolVar(&attachOpts.NoStdin, "no-stdin", false, "Do not attach STDIN. The default is false") diff --git a/cmd/podman/containers/commit.go b/cmd/podman/containers/commit.go index 69e343f59..137e486eb 100644 --- a/cmd/podman/containers/commit.go +++ b/cmd/podman/containers/commit.go @@ -72,7 +72,7 @@ func init() { registry.Commands = append(registry.Commands, registry.CliCommand{ Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, - Command: containerAttachCommand, + Command: containerCommitCommand, Parent: containerCmd, }) containerCommitFlags := containerCommitCommand.Flags() diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index ffad26fe9..06b89b0fc 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -34,8 +34,8 @@ var ( Long: runCommand.Long, RunE: runCommand.RunE, Example: `podman container run imageID ls -alF /etc - podman container run --network=host imageID dnf -y install java - podman container run --volume /var/hostdir:/var/ctrdir -i -t fedora /bin/bash`, + podman container run --network=host imageID dnf -y install java + podman container run --volume /var/hostdir:/var/ctrdir -i -t fedora /bin/bash`, } ) diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go index a321b130e..73f37e51f 100644 --- a/cmd/podman/containers/start.go +++ b/cmd/podman/containers/start.go @@ -66,7 +66,7 @@ func init() { Parent: containerCmd, }) - containerStartFlags := containerRunCommand.Flags() + containerStartFlags := containerStartCommand.Flags() startFlags(containerStartFlags) } -- cgit v1.2.3-54-g00ecf