diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go index 3dd6585958..4b0ae5fe36 100644 --- a/cmd/podman/containers/pause.go +++ b/cmd/podman/containers/pause.go @@ -63,7 +63,7 @@ func pauseFlags(cmd *cobra.Command) { _ = cmd.RegisterFlagCompletionFunc(cidfileFlagName, completion.AutocompleteDefault) filterFlagName := "filter" - flags.StringSliceVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") + flags.StringArrayVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") _ = cmd.RegisterFlagCompletionFunc(filterFlagName, common.AutocompletePsFilters) if registry.IsRemote() { diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go index 6487f0fe21..05df8faa6e 100644 --- a/cmd/podman/containers/ps.go +++ b/cmd/podman/containers/ps.go @@ -76,7 +76,7 @@ func listFlagSet(cmd *cobra.Command) { flags.BoolVar(&listOpts.External, "external", false, "Show containers in storage not controlled by Podman") filterFlagName := "filter" - flags.StringSliceVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") + flags.StringArrayVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") _ = cmd.RegisterFlagCompletionFunc(filterFlagName, common.AutocompletePsFilters) formatFlagName := "format" diff --git a/cmd/podman/containers/restart.go b/cmd/podman/containers/restart.go index b4886575a2..83b9cda142 100644 --- a/cmd/podman/containers/restart.go +++ b/cmd/podman/containers/restart.go @@ -66,7 +66,7 @@ func restartFlags(cmd *cobra.Command) { _ = cmd.RegisterFlagCompletionFunc(cidfileFlagName, completion.AutocompleteDefault) filterFlagName := "filter" - flags.StringSliceVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") + flags.StringArrayVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") _ = cmd.RegisterFlagCompletionFunc(filterFlagName, common.AutocompletePsFilters) timeFlagName := "time" diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go index fcd9935fc6..7bb90d3c60 100644 --- a/cmd/podman/containers/rm.go +++ b/cmd/podman/containers/rm.go @@ -75,7 +75,7 @@ func rmFlags(cmd *cobra.Command) { _ = cmd.RegisterFlagCompletionFunc(cidfileFlagName, completion.AutocompleteDefault) filterFlagName := "filter" - flags.StringSliceVar(&filters, filterFlagName, []string{}, "Filter output based on conditions given") + flags.StringArrayVar(&filters, filterFlagName, []string{}, "Filter output based on conditions given") _ = cmd.RegisterFlagCompletionFunc(filterFlagName, common.AutocompletePsFilters) if !registry.IsRemote() { diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go index b67a5ae547..1e1f68f72d 100644 --- a/cmd/podman/containers/start.go +++ b/cmd/podman/containers/start.go @@ -61,7 +61,7 @@ func startFlags(cmd *cobra.Command) { flags.BoolVar(&startOptions.SigProxy, "sig-proxy", false, "Proxy received signals to the process (default true if attaching, false otherwise)") filterFlagName := "filter" - flags.StringSliceVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") + flags.StringArrayVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") _ = cmd.RegisterFlagCompletionFunc(filterFlagName, common.AutocompletePsFilters) flags.BoolVar(&startOptions.All, "all", false, "Start all containers regardless of their state or configuration") diff --git a/cmd/podman/containers/stop.go b/cmd/podman/containers/stop.go index a03f681fbe..2afcfdb2b5 100644 --- a/cmd/podman/containers/stop.go +++ b/cmd/podman/containers/stop.go @@ -71,7 +71,7 @@ func stopFlags(cmd *cobra.Command) { _ = cmd.RegisterFlagCompletionFunc(timeFlagName, completion.AutocompleteNone) filterFlagName := "filter" - flags.StringSliceVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") + flags.StringArrayVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") _ = cmd.RegisterFlagCompletionFunc(filterFlagName, common.AutocompletePsFilters) if registry.IsRemote() { diff --git a/cmd/podman/containers/unpause.go b/cmd/podman/containers/unpause.go index 00f2294472..68ef8e1f54 100644 --- a/cmd/podman/containers/unpause.go +++ b/cmd/podman/containers/unpause.go @@ -64,7 +64,7 @@ func unpauseFlags(cmd *cobra.Command) { _ = cmd.RegisterFlagCompletionFunc(cidfileFlagName, completion.AutocompleteDefault) filterFlagName := "filter" - flags.StringSliceVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") + flags.StringArrayVarP(&filters, filterFlagName, "f", []string{}, "Filter output based on conditions given") _ = cmd.RegisterFlagCompletionFunc(filterFlagName, common.AutocompletePsFilters) if registry.IsRemote() { diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index 1c464d91c6..d8804e8a56 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -89,7 +89,7 @@ func imageListFlagSet(cmd *cobra.Command) { flags.BoolVarP(&listOptions.All, "all", "a", false, "Show all images (default hides intermediate images)") filterFlagName := "filter" - flags.StringSliceVarP(&listOptions.Filter, filterFlagName, "f", []string{}, "Filter output based on conditions provided (default [])") + flags.StringArrayVarP(&listOptions.Filter, filterFlagName, "f", []string{}, "Filter output based on conditions provided (default [])") _ = cmd.RegisterFlagCompletionFunc(filterFlagName, common.AutocompleteImageFilters) formatFlagName := "format" diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go index 5e41ee1853..f88f8df042 100644 --- a/cmd/podman/images/search.go +++ b/cmd/podman/images/search.go @@ -84,7 +84,7 @@ func searchFlags(cmd *cobra.Command) { flags := cmd.Flags() filterFlagName := "filter" - flags.StringSliceVarP(&searchOptions.Filters, filterFlagName, "f", []string{}, "Filter output based on conditions provided (default [])") + flags.StringArrayVarP(&searchOptions.Filters, filterFlagName, "f", []string{}, "Filter output based on conditions provided (default [])") _ = cmd.RegisterFlagCompletionFunc(filterFlagName, common.AutocompleteImageSearchFilters) formatFlagName := "format" diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index 405d7cdc03..893058643e 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -53,7 +53,7 @@ func init() { flags.BoolVar(&psInput.CtrStatus, "ctr-status", false, "Display the container status") filterFlagName := "filter" - flags.StringSliceVarP(&inputFilters, filterFlagName, "f", []string{}, "Filter output based on conditions given") + flags.StringArrayVarP(&inputFilters, filterFlagName, "f", []string{}, "Filter output based on conditions given") _ = psCmd.RegisterFlagCompletionFunc(filterFlagName, common.AutocompletePodPsFilters) formatFlagName := "format" diff --git a/cmd/podman/secrets/list.go b/cmd/podman/secrets/list.go index f028442bca..382e0b820f 100644 --- a/cmd/podman/secrets/list.go +++ b/cmd/podman/secrets/list.go @@ -50,7 +50,7 @@ func init() { _ = lsCmd.RegisterFlagCompletionFunc(formatFlagName, common.AutocompleteFormat(&entities.SecretInfoReport{})) filterFlagName := "filter" - flags.StringSliceVarP(&listFlag.filter, filterFlagName, "f", []string{}, "Filter secret output") + flags.StringArrayVarP(&listFlag.filter, filterFlagName, "f", []string{}, "Filter secret output") _ = lsCmd.RegisterFlagCompletionFunc(filterFlagName, common.AutocompleteSecretFilters) noHeadingFlagName := "noheading" diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index 6afb9f66ea..28f0669638 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -51,7 +51,7 @@ func init() { flags := lsCommand.Flags() filterFlagName := "filter" - flags.StringSliceVarP(&cliOpts.Filter, filterFlagName, "f", []string{}, "Filter volume output") + flags.StringArrayVarP(&cliOpts.Filter, filterFlagName, "f", []string{}, "Filter volume output") _ = lsCommand.RegisterFlagCompletionFunc(filterFlagName, common.AutocompleteVolumeFilters) formatFlagName := "format"