diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-06 15:55:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 15:55:15 -0400 |
| commit | e3e2b1e65930bfc40c5b60802c4d6ea175169732 (patch) | |
| tree | de9fbf65281b2d9e69eaa90be2bdee96d3047d5c /cmd/podman/play | |
| parent | b8ad7f241aba622b23b2cfab6fb5284cd26125e3 (diff) | |
| parent | 2fb9bb20df49f665dbc7420a80dc2da57530278f (diff) | |
| download | podman-e3e2b1e65930bfc40c5b60802c4d6ea175169732.tar.gz podman-e3e2b1e65930bfc40c5b60802c4d6ea175169732.tar.bz2 podman-e3e2b1e65930bfc40c5b60802c4d6ea175169732.zip | |
Merge pull request #6871 from mheon/202_backports
Backports for v2.0.2
Diffstat (limited to 'cmd/podman/play')
| -rw-r--r-- | cmd/podman/play/kube.go | 1 | ||||
| -rw-r--r-- | cmd/podman/play/play.go | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cmd/podman/play/kube.go b/cmd/podman/play/kube.go index 3567295bf..9bd5c10db 100644 --- a/cmd/podman/play/kube.go +++ b/cmd/podman/play/kube.go @@ -61,7 +61,6 @@ func init() { flags.StringVar(&kubeOptions.SignaturePolicy, "signature-policy", "", "`Pathname` of signature policy file (not usually used)") flags.StringVar(&kubeOptions.SeccompProfileRoot, "seccomp-profile-root", defaultSeccompRoot, "Directory path for seccomp profiles") } - _ = flags.MarkHidden("signature-policy") } diff --git a/cmd/podman/play/play.go b/cmd/podman/play/play.go index f7018eafb..eb8873595 100644 --- a/cmd/podman/play/play.go +++ b/cmd/podman/play/play.go @@ -10,11 +10,10 @@ import ( var ( // Command: podman _play_ playCmd = &cobra.Command{ - Use: "play", - Short: "Play a pod and its containers from a structured file.", - Long: "Play structured data (e.g., Kubernetes pod or service yaml) based on containers and pods.", - TraverseChildren: true, - RunE: validate.SubCommandExists, + Use: "play", + Short: "Play a pod and its containers from a structured file.", + Long: "Play structured data (e.g., Kubernetes pod or service yaml) based on containers and pods.", + RunE: validate.SubCommandExists, } ) |