summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-21 14:00:00 -0400
committerGitHub <noreply@github.com>2020-04-21 14:00:00 -0400
commitb879ccbb7393517ddce5f89886c2530393521068 (patch)
treea62803ad3cefd4f10c5169616e12e76edcd987c7 /cmd
parent0d817f5210defac51cc86c60ec86bcefca0511c9 (diff)
parent860356970b0be5a38cb2714c2ad081972c846814 (diff)
downloadpodman-b879ccbb7393517ddce5f89886c2530393521068.tar.gz
podman-b879ccbb7393517ddce5f89886c2530393521068.tar.bz2
podman-b879ccbb7393517ddce5f89886c2530393521068.zip
Merge pull request #5923 from baude/mybad
my bad
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/containers/attach.go17
-rw-r--r--cmd/podman/containers/commit.go2
-rw-r--r--cmd/podman/containers/run.go4
-rw-r--r--cmd/podman/containers/start.go2
4 files changed, 4 insertions, 21 deletions
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-<value>`, where `<value>` 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)
}