diff options
author | Jhon Honce <jhonce@redhat.com> | 2021-05-18 11:23:25 -0700 |
---|---|---|
committer | Jhon Honce <jhonce@redhat.com> | 2021-05-27 11:40:43 -0700 |
commit | 33944cefe7c1f3e11c8389bedb3e4c80af8541bd (patch) | |
tree | 594d3da7b2cb2a8620be0afbca2cd27087192326 /cmd/podman/images/rmi.go | |
parent | 4f4a440afd521913745c314f2bebd0da45d9668e (diff) | |
download | podman-33944cefe7c1f3e11c8389bedb3e4c80af8541bd.tar.gz podman-33944cefe7c1f3e11c8389bedb3e4c80af8541bd.tar.bz2 podman-33944cefe7c1f3e11c8389bedb3e4c80af8541bd.zip |
[Techinal Debt] Cleanup ABI vs. Tunnel CLI commands
[NO TESTS NEEDED]
This commit cleans up two issues:
* Most commands support all EngineModes so default to that. Let
outlayers declare their intent.
* Use cobra.Annotations to set supported EngineMode. This simplies
instantiating commands as there is now one method to communicate a
commands requirements rather than two.
* Combined aliased commands into one file
* Fixed aliased commands where Args field did not match
* Updated examples in README.md for writing commands
* Remove redundant flag DisableFlagsInUseLine in cobra.Command
initialization.
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/images/rmi.go')
-rw-r--r-- | cmd/podman/images/rmi.go | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/cmd/podman/images/rmi.go b/cmd/podman/images/rmi.go deleted file mode 100644 index edd6ae96f..000000000 --- a/cmd/podman/images/rmi.go +++ /dev/null @@ -1,29 +0,0 @@ -package images - -import ( - "strings" - - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/spf13/cobra" -) - -var ( - rmiCmd = &cobra.Command{ - Use: strings.Replace(rmCmd.Use, "rm ", "rmi ", 1), - Args: rmCmd.Args, - Short: rmCmd.Short, - Long: rmCmd.Long, - RunE: rmCmd.RunE, - ValidArgsFunction: rmCmd.ValidArgsFunction, - Example: strings.Replace(rmCmd.Example, "podman image rm", "podman rmi", -1), - } -) - -func init() { - registry.Commands = append(registry.Commands, registry.CliCommand{ - Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, - Command: rmiCmd, - }) - imageRemoveFlagSet(rmiCmd.Flags()) -} |