summaryrefslogtreecommitdiff
path: root/cmd/podmanV2/root.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-24 13:12:06 +0100
committerGitHub <noreply@github.com>2020-03-24 13:12:06 +0100
commit3dbf2cb5aff67f82e486cd95aca170e44b8fc75a (patch)
tree0e67d02bcdb5caed701c22b332a4ad6f2bbe6fe6 /cmd/podmanV2/root.go
parenta2ffd5c230ea6f53ed40ccc60e869164fee41899 (diff)
parent9536560b4f3a38fbba4ac61c357dd3627fb6cf4e (diff)
downloadpodman-3dbf2cb5aff67f82e486cd95aca170e44b8fc75a.tar.gz
podman-3dbf2cb5aff67f82e486cd95aca170e44b8fc75a.tar.bz2
podman-3dbf2cb5aff67f82e486cd95aca170e44b8fc75a.zip
Merge pull request #5581 from baude/v2containers
podmanv2 add core container commands
Diffstat (limited to 'cmd/podmanV2/root.go')
-rw-r--r--cmd/podmanV2/root.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podmanV2/root.go b/cmd/podmanV2/root.go
index 24b083b9f..b0dd7643f 100644
--- a/cmd/podmanV2/root.go
+++ b/cmd/podmanV2/root.go
@@ -23,8 +23,9 @@ var rootCmd = &cobra.Command{
func init() {
// Override default --help information of `--version` global flag}
var dummyVersion bool
- rootCmd.PersistentFlags().BoolVarP(&dummyVersion, "version", "v", false, "Version of podman")
- rootCmd.PersistentFlags().StringVarP(&registry.EngineOpts.Uri, "remote", "r", "", "URL to access podman service")
+ // TODO had to disable shorthand -v for version due to -v rm with volume
+ rootCmd.PersistentFlags().BoolVar(&dummyVersion, "version", false, "Version of Podman")
+ rootCmd.PersistentFlags().StringVarP(&registry.EngineOpts.Uri, "remote", "r", "", "URL to access Podman service")
rootCmd.PersistentFlags().StringSliceVar(&registry.EngineOpts.Identities, "identity", []string{}, "path to SSH identity file")
}