improve error reporting

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
docker · Oct 27, 2021 · 5df5f77 · 5df5f77
1 parent e1e2d06
commit 5df5f77
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/cmd/compose/up.go b/cmd/compose/up.go
@@ -134,7 +134,7 @@ func upCommand(p *projectOptions, backend api.Service) *cobra.Command {
 	flags.BoolVar(&up.attachDependencies, "attach-dependencies", false, "Attach to dependent containers.")
 	flags.BoolVar(&create.quietPull, "quiet-pull", false, "Pull without printing progress information.")
 	flags.StringArrayVar(&up.attach, "attach", []string{}, "Attach to service output.")
-	flags.StringArrayVar(&up.wait, "wait", []string{}, "[SERVICE:]CONDITION Wait for service(s) to reach condition (started|healthy|completed_successfully). implies detached mode.")
+	flags.StringArrayVar(&up.wait, "wait", []string{}, "[SERVICE:]CONDITION Wait for service(s) to reach condition (started|healthy|completed_successfully). Implies detached mode.")
 
 	return upCmd
 }

diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -124,7 +124,7 @@ type StartOptions struct {
 	CascadeStop bool
 	// ExitCodeFrom return exit code from specified service
 	ExitCodeFrom string
-	// WaitCondition define condition to wait for before considering project is up
+	// WaitCondition define conditions to wait for before considering project is up. format is [SERVICE:]CONDITION
 	WaitCondition []string
 }
 

diff --git a/pkg/compose/create.go b/pkg/compose/create.go
@@ -493,6 +493,7 @@ func getDeployResources(s types.ServiceConfig) container.Resources {
 		MemorySwap:         int64(s.MemSwapLimit),
 		MemorySwappiness:   swappiness,
 		MemoryReservation:  int64(s.MemReservation),
+		OomKillDisable:     &s.OomKillDisable,
 		CPUCount:           s.CPUCount,
 		CPUPeriod:          s.CPUPeriod,
 		CPUQuota:           s.CPUQuota,
@@ -503,6 +504,10 @@ func getDeployResources(s types.ServiceConfig) container.Resources {
 		CpusetCpus:         s.CPUSet,
 	}
 
+	if s.PidsLimit != 0 {
+		resources.PidsLimit = &s.PidsLimit
+	}
+
 	setBlkio(s.BlkioConfig, &resources)
 
 	if s.Deploy != nil {

diff --git a/pkg/compose/start.go b/pkg/compose/start.go
@@ -18,6 +18,7 @@ package compose
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
 	"github.com/compose-spec/compose-go/types"
@@ -27,6 +28,7 @@ import (
 
 	"github.com/docker/compose/v2/pkg/api"
 	"github.com/docker/compose/v2/pkg/progress"
+	"github.com/docker/compose/v2/pkg/utils"
 )
 
 func (s *composeService) Start(ctx context.Context, project *types.Project, options api.StartOptions) error {
@@ -60,12 +62,7 @@ func (s *composeService) start(ctx context.Context, project *types.Project, opti
 			return err
 		}
 
-		err = s.startService(ctx, project, service)
-		if err != nil {
-			return err
-		}
-
-		return nil
+		return s.startService(ctx, project, service)
 	})
 	if err != nil {
 		return err
@@ -92,19 +89,26 @@ func (s *composeService) waitServices(ctx context.Context, project *types.Projec
 				Condition: condition,
 			}
 		} else {
-			condition := "service_" + split[0]
+			condition := split[0]
+			if len(condition) == 0 {
+				return errors.New("a wait condition must be set")
+			}
+			serviceCondition := "service_" + condition
+			supportedValues := []string{
+				types.ServiceConditionStarted,
+				types.ServiceConditionHealthy,
+				types.ServiceConditionCompletedSuccessfully}
+			if !utils.StringContains(supportedValues, serviceCondition) {
+				return fmt.Errorf("unsupported service condition %s", condition)
+			}
 			for _, s := range project.Services {
 				depends[s.Name] = types.ServiceDependency{
-					Condition: condition,
+					Condition: serviceCondition,
 				}
 			}
 		}
 	}
-	err := s.waitDependencies(ctx, project, depends)
-	if err != nil {
-		return err
-	}
-	return nil
+	return s.waitDependencies(ctx, project, depends)
 }
 
 type containerWatchFn func(container moby.Container) error