opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 01:19:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

my bad

Browse Source 
typos in previous pr are causing panics

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2020-04-21 10:46:23 -05:00
parent 1ed849f2d1
commit 860356970b
4 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/podman/containers/attach.go
View File

@ -43,23 +43,6 @@ var (
attachOpts entities.AttachOptions 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) { 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.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") flags.BoolVar(&attachOpts.NoStdin, "no-stdin", false, "Do not attach STDIN. The default is false")

2
cmd/podman/containers/commit.go
View File

@ -72,7 +72,7 @@ func init() {
registry.Commands = append(registry.Commands, registry.CliCommand{ registry.Commands = append(registry.Commands, registry.CliCommand{
Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
Command: containerAttachCommand, Command: containerCommitCommand,
Parent: containerCmd, Parent: containerCmd,
}) })
containerCommitFlags := containerCommitCommand.Flags() containerCommitFlags := containerCommitCommand.Flags()

4
cmd/podman/containers/run.go
View File

@ -34,8 +34,8 @@ var (
Long: runCommand.Long, Long: runCommand.Long,
RunE: runCommand.RunE, RunE: runCommand.RunE,
Example: `podman container run imageID ls -alF /etc Example: `podman container run imageID ls -alF /etc
podman container run --network=host imageID dnf -y install java 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 --volume /var/hostdir:/var/ctrdir -i -t fedora /bin/bash`,
} }
) )

2
cmd/podman/containers/start.go
View File

@ -66,7 +66,7 @@ func init() {
Parent: containerCmd, Parent: containerCmd,
}) })
containerStartFlags := containerRunCommand.Flags() containerStartFlags := containerStartCommand.Flags()
startFlags(containerStartFlags) startFlags(containerStartFlags)
} }