diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-28 23:29:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-28 23:29:20 +0200 |
commit | bf4efc1953467907ae7d75d5f3ef3cd41505ee24 (patch) | |
tree | f6743d64621b126ff5e5f92c46fa4e56d279f26b /cmd/podman/pods | |
parent | dcac908bbe879a8b0b453531252dddccf8690077 (diff) | |
parent | 517bc28360ba6417d5333720f03f010514862ec3 (diff) | |
download | podman-bf4efc1953467907ae7d75d5f3ef3cd41505ee24.tar.gz podman-bf4efc1953467907ae7d75d5f3ef3cd41505ee24.tar.bz2 podman-bf4efc1953467907ae7d75d5f3ef3cd41505ee24.zip |
Merge pull request #6026 from baude/v2forcesystemtests
system tests must pass
Diffstat (limited to 'cmd/podman/pods')
-rw-r--r-- | cmd/podman/pods/create.go | 2 | ||||
-rw-r--r-- | cmd/podman/pods/exists.go | 1 | ||||
-rw-r--r-- | cmd/podman/pods/ps.go | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index ff21166f3..0c0d07b3e 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -24,7 +24,7 @@ var ( createCommand = &cobra.Command{ Use: "create", - Args: cobra.NoArgs, + Args: common.NoArgs, Short: "Create a new empty pod", Long: podCreateDescription, RunE: create, diff --git a/cmd/podman/pods/exists.go b/cmd/podman/pods/exists.go index 5a94bf150..cf3e3eae5 100644 --- a/cmd/podman/pods/exists.go +++ b/cmd/podman/pods/exists.go @@ -19,6 +19,7 @@ var ( Args: cobra.ExactArgs(1), Example: `podman pod exists podID podman pod exists mypod || podman pod create --name mypod`, + DisableFlagsInUseLine: true, } ) diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index 6d0d9cf7f..8ae1f91a8 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -11,6 +11,7 @@ import ( "text/template" "time" + "github.com/containers/libpod/cmd/podman/common" "github.com/containers/libpod/cmd/podman/registry" "github.com/containers/libpod/pkg/domain/entities" "github.com/docker/go-units" @@ -28,6 +29,7 @@ var ( Short: "list pods", Long: psDescription, RunE: pods, + Args: common.NoArgs, } ) |