summaryrefslogtreecommitdiff
path: root/cmd/podman/pods/rm.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-29 11:31:39 -0400
committerGitHub <noreply@github.com>2020-06-29 11:31:39 -0400
commit59e6192eb6027ebf520a4b5ea4137d0a85f23c02 (patch)
treed4641b6c3f7d6a1c7d4fa64df3994578ca0630be /cmd/podman/pods/rm.go
parent6ac009d5304127f6758be157c7302646e5a481e5 (diff)
parent6fb5f01c736d5cbf11bc7eaad09f6f0c7fd1d0d4 (diff)
downloadpodman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.tar.gz
podman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.tar.bz2
podman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.zip
Merge pull request #6716 from jwhonce/issues/6598
Fixes --remote flag issues
Diffstat (limited to 'cmd/podman/pods/rm.go')
-rw-r--r--cmd/podman/pods/rm.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go
index ec8dae1d1..5a5aa699b 100644
--- a/cmd/podman/pods/rm.go
+++ b/cmd/podman/pods/rm.go
@@ -5,9 +5,9 @@ import (
"fmt"
"github.com/containers/libpod/cmd/podman/common"
- "github.com/containers/libpod/cmd/podman/parse"
"github.com/containers/libpod/cmd/podman/registry"
"github.com/containers/libpod/cmd/podman/utils"
+ "github.com/containers/libpod/cmd/podman/validate"
"github.com/containers/libpod/pkg/domain/entities"
"github.com/spf13/cobra"
)
@@ -30,7 +30,7 @@ var (
Long: podRmDescription,
RunE: rm,
Args: func(cmd *cobra.Command, args []string) error {
- return parse.CheckAllLatestAndPodIDFile(cmd, args, false, true)
+ return validate.CheckAllLatestAndPodIDFile(cmd, args, false, true)
},
Example: `podman pod rm mywebserverpod
podman pod rm -f 860a4b23
@@ -49,15 +49,15 @@ func init() {
flags.BoolVarP(&rmOptions.All, "all", "a", false, "Remove all running pods")
flags.BoolVarP(&rmOptions.Force, "force", "f", false, "Force removal of a running pod by first stopping all containers, then removing all containers in the pod. The default is false")
flags.BoolVarP(&rmOptions.Ignore, "ignore", "i", false, "Ignore errors when a specified pod is missing")
- flags.BoolVarP(&rmOptions.Latest, "latest", "l", false, "Remove the latest pod podman is aware of")
flags.StringArrayVarP(&rmOptions.PodIDFiles, "pod-id-file", "", nil, "Read the pod ID from the file")
+ validate.AddLatestFlag(rmCommand, &rmOptions.Latest)
+
if registry.IsRemote() {
- _ = flags.MarkHidden("latest")
_ = flags.MarkHidden("ignore")
}
}
-func rm(cmd *cobra.Command, args []string) error {
+func rm(_ *cobra.Command, args []string) error {
ids, err := common.ReadPodIDFiles(rmOptions.PodIDFiles)
if err != nil {
return err