diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-16 11:56:16 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-16 11:56:16 -0700 |
commit | 57f3897289e886bbc775584f430f65a8765e4301 (patch) | |
tree | 48d126d08e768d91b8c0a9f20e68b8bd98b8f36e /cmd/podmanV2/diff.go | |
parent | 8b178f12ce34b1ac2b14c1e56cb6e5b3937f7122 (diff) | |
parent | 1d93d212541616135da23bcf01ca49180f113e62 (diff) | |
download | podman-57f3897289e886bbc775584f430f65a8765e4301.tar.gz podman-57f3897289e886bbc775584f430f65a8765e4301.tar.bz2 podman-57f3897289e886bbc775584f430f65a8765e4301.zip |
Merge pull request #5848 from jwhonce/wip/options
V2 Enable rootless
Diffstat (limited to 'cmd/podmanV2/diff.go')
-rw-r--r-- | cmd/podmanV2/diff.go | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/cmd/podmanV2/diff.go b/cmd/podmanV2/diff.go index 6e4263370..73f4661db 100644 --- a/cmd/podmanV2/diff.go +++ b/cmd/podmanV2/diff.go @@ -35,9 +35,6 @@ func init() { Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode}, Command: diffCmd, }) - diffCmd.SetHelpTemplate(registry.HelpTemplate()) - diffCmd.SetUsageTemplate(registry.UsageTemplate()) - flags := diffCmd.Flags() flags.BoolVar(&diffOpts.Archive, "archive", true, "Save the diff as a tar archive") _ = flags.MarkHidden("archive") @@ -49,23 +46,13 @@ func init() { } func diff(cmd *cobra.Command, args []string) error { - ie, err := registry.NewImageEngine(cmd, args) - if err != nil { - return err - } - - if found, err := ie.Exists(registry.GetContext(), args[0]); err != nil { + if found, err := registry.ImageEngine().Exists(registry.GetContext(), args[0]); err != nil { return err } else if found.Value { return images.Diff(cmd, args, diffOpts) } - ce, err := registry.NewContainerEngine(cmd, args) - if err != nil { - return err - } - - if found, err := ce.ContainerExists(registry.GetContext(), args[0]); err != nil { + if found, err := registry.ContainerEngine().ContainerExists(registry.GetContext(), args[0]); err != nil { return err } else if found.Value { return containers.Diff(cmd, args, diffOpts) |