1 files changed, 27 insertions, 3 deletions
diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go
index 9b358db74..dcd1eca82 100644
--- a/cmd/podman/containers/start.go
+++ b/cmd/podman/containers/start.go
@@ -3,6 +3,7 @@ package containers
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/containers/podman/v3/cmd/podman/common"
 	"github.com/containers/podman/v3/cmd/podman/registry"
@@ -42,7 +43,9 @@ var (
 )
 
 var (
-	startOptions entities.ContainerStartOptions
+	startOptions = entities.ContainerStartOptions{
+		Filters: make(map[string][]string),
+	}
 )
 
 func startFlags(cmd *cobra.Command) {
@@ -56,6 +59,10 @@ func startFlags(cmd *cobra.Command) {
 
 	flags.BoolVarP(&startOptions.Interactive, "interactive", "i", false, "Keep STDIN open even if not attached")
 	flags.BoolVar(&startOptions.SigProxy, "sig-proxy", false, "Proxy received signals to the process (default true if attaching, false otherwise)")
+	flags.StringSliceVarP(&filters, "filter", "f", []string{}, "Filter output based on conditions given")
+	_ = cmd.RegisterFlagCompletionFunc("filter", common.AutocompletePsFilters)
+
+	flags.BoolVar(&startOptions.All, "all", false, "Start all containers regardless of their state or configuration")
 
 	if registry.IsRemote() {
 		_ = flags.MarkHidden("sig-proxy")
@@ -79,7 +86,7 @@ func init() {
 }
 
 func validateStart(cmd *cobra.Command, args []string) error {
-	if len(args) == 0 && !startOptions.Latest {
+	if len(args) == 0 && !startOptions.Latest && !startOptions.All {
 		return errors.New("start requires at least one argument")
 	}
 	if len(args) > 0 && startOptions.Latest {
@@ -88,6 +95,12 @@ func validateStart(cmd *cobra.Command, args []string) error {
 	if len(args) > 1 && startOptions.Attach {
 		return errors.Errorf("you cannot start and attach multiple containers at once")
 	}
+	if (len(args) > 0 || startOptions.Latest) && startOptions.All {
+		return errors.Errorf("either start all containers or the container(s) provided in the arguments")
+	}
+	if startOptions.Attach && startOptions.All {
+		return errors.Errorf("you cannot start and attach all containers at once")
+	}
 	return nil
 }
 
@@ -108,7 +121,18 @@ func start(cmd *cobra.Command, args []string) error {
 		startOptions.Stdout = os.Stdout
 	}
 
-	responses, err := registry.ContainerEngine().ContainerStart(registry.GetContext(), args, startOptions)
+	var containers []string = args
+	if len(filters) > 0 {
+		for _, f := range filters {
+			split := strings.SplitN(f, "=", 2)
+			if len(split) == 1 {
+				return errors.Errorf("invalid filter %q", f)
+			}
+			startOptions.Filters[split[0]] = append(startOptions.Filters[split[0]], split[1])
+		}
+	}
+
+	responses, err := registry.ContainerEngine().ContainerStart(registry.GetContext(), containers, startOptions)
 	if err != nil {
 		return err
 	}