diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-30 20:01:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 20:01:55 +0200 |
| commit | 6900517f109d78ed5a9b794666b7d97782cf6ce9 (patch) | |
| tree | 05e08e081bd03d23943dd255fabdcafe8b83147d /cmd/podman/images | |
| parent | fc9451ed15e3ea2fbdcd5754b367db74eec1063e (diff) | |
| parent | 22d5b2e3053ad66ce3b30eba3adfca70bc8e389d (diff) | |
| download | podman-6900517f109d78ed5a9b794666b7d97782cf6ce9.tar.gz podman-6900517f109d78ed5a9b794666b7d97782cf6ce9.tar.bz2 podman-6900517f109d78ed5a9b794666b7d97782cf6ce9.zip | |
Merge pull request #6046 from jwhonce/jira/822
V2 enable ps tests
Diffstat (limited to 'cmd/podman/images')
| -rw-r--r-- | cmd/podman/images/image.go | 3 | ||||
| -rw-r--r-- | cmd/podman/images/prune.go | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmd/podman/images/image.go b/cmd/podman/images/image.go index 604f49251..790c16c05 100644 --- a/cmd/podman/images/image.go +++ b/cmd/podman/images/image.go @@ -2,6 +2,7 @@ package images import ( "github.com/containers/libpod/cmd/podman/registry" + "github.com/containers/libpod/cmd/podman/validate" "github.com/containers/libpod/pkg/domain/entities" "github.com/spf13/cobra" ) @@ -16,7 +17,7 @@ var ( Short: "Manage images", Long: "Manage images", TraverseChildren: true, - RunE: registry.SubCommandExists, + RunE: validate.SubCommandExists, } ) diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go index eb9e4a7e4..53a1966c1 100644 --- a/cmd/podman/images/prune.go +++ b/cmd/podman/images/prune.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/containers/libpod/cmd/podman/common" "github.com/containers/libpod/cmd/podman/registry" + "github.com/containers/libpod/cmd/podman/validate" "github.com/containers/libpod/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -19,7 +19,7 @@ var ( If an image is not being used by a container, it will be removed from the system.` pruneCmd = &cobra.Command{ Use: "prune", - Args: common.NoArgs, + Args: validate.NoArgs, Short: "Remove unused images", Long: pruneDescription, RunE: prune, |