summaryrefslogtreecommitdiff
path: root/cmd/podmanV2/images
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-24 21:48:37 +0100
committerGitHub <noreply@github.com>2020-03-24 21:48:37 +0100
commit0c084d9719772a9b68d5eb67114cf5bf001958b2 (patch)
treef6ed82f9c435c30b44d5c820502607ba60e89282 /cmd/podmanV2/images
parentc29a4c69044c02eee564fc72c64144b2a76d1d73 (diff)
parent77a2af8817284d134ea1f30f0b06291a5b05c5a0 (diff)
downloadpodman-0c084d9719772a9b68d5eb67114cf5bf001958b2.tar.gz
podman-0c084d9719772a9b68d5eb67114cf5bf001958b2.tar.bz2
podman-0c084d9719772a9b68d5eb67114cf5bf001958b2.zip
Merge pull request #5592 from jwhonce/wip/globalflags
Combine GlobalFlags and EngineFlags into EngineOptions
Diffstat (limited to 'cmd/podmanV2/images')
-rw-r--r--cmd/podmanV2/images/inspect.go2
-rw-r--r--cmd/podmanV2/images/list.go1
2 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podmanV2/images/inspect.go b/cmd/podmanV2/images/inspect.go
index 2ecbbb201..f8fd44571 100644
--- a/cmd/podmanV2/images/inspect.go
+++ b/cmd/podmanV2/images/inspect.go
@@ -52,7 +52,7 @@ func init() {
flags.BoolVarP(&inspectOpts.Size, "size", "s", false, "Display total file size")
flags.StringVarP(&inspectOpts.Format, "format", "f", "", "Change the output format to a Go template")
- if registry.EngineOpts.EngineMode == entities.ABIMode {
+ if registry.EngineOptions.EngineMode == entities.ABIMode {
// TODO: This is the same as V1. We could skip creating the flag altogether in V2...
_ = flags.MarkHidden("latest")
}
diff --git a/cmd/podmanV2/images/list.go b/cmd/podmanV2/images/list.go
index cfdfaaed2..0441f8fd8 100644
--- a/cmd/podmanV2/images/list.go
+++ b/cmd/podmanV2/images/list.go
@@ -29,5 +29,6 @@ func init() {
}
func images(cmd *cobra.Command, args []string) error {
+ _, _ = registry.Options(cmd)
return nil
}