diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-11 20:58:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 20:58:57 +0100 |
| commit | 54a5584d84d37632c1c8480d437a012625526a84 (patch) | |
| tree | b830557a2607c9b005532906630fb537a163ed46 /cmd/podman/main.go | |
| parent | b7a3685cbae421bfd882c7c592b1721071cde984 (diff) | |
| parent | 13d2354bc6b43571061d6eccab560fe1f226339e (diff) | |
| download | podman-54a5584d84d37632c1c8480d437a012625526a84.tar.gz podman-54a5584d84d37632c1c8480d437a012625526a84.tar.bz2 podman-54a5584d84d37632c1c8480d437a012625526a84.zip | |
Merge pull request #2307 from baude/repruneremote
Separate remote and local commands
Diffstat (limited to 'cmd/podman/main.go')
| -rw-r--r-- | cmd/podman/main.go | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 32ecaede7..49acde1f9 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -27,6 +27,24 @@ var ( exitCode = 125 ) +// Commands that the remote and local client have +// implemented. +var mainCommands = []*cobra.Command{ + _exportCommand, + _historyCommand, + _imagesCommand, + _importCommand, + _infoCommand, + _inspectCommand, + _killCommand, + _pullCommand, + _rmiCommand, + _tagCommand, + _versionCommand, + imageCommand.Command, + systemCommand.Command, +} + var cmdsNotRequiringRootless = map[*cobra.Command]bool{ _versionCommand: true, _createCommand: true, @@ -92,6 +110,8 @@ func init() { rootCmd.PersistentFlags().BoolVar(&MainGlobalOpts.Syslog, "syslog", false, "Output logging information to syslog as well as the console") rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.TmpDir, "tmpdir", "", "Path to the tmp directory") + rootCmd.AddCommand(mainCommands...) + rootCmd.AddCommand(getMainCommands()...) } func initConfig() { |