Address review comments

docker · Dec 9, 2022 · cc56638 · cc56638
1 parent d467aec
commit cc56638
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/cmd/compose/pull.go b/cmd/compose/pull.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/compose-spec/compose-go/types"
 	"github.com/morikuni/aec"
 	"github.com/spf13/cobra"
 
@@ -67,23 +68,29 @@ func pullCommand(p *projectOptions, backend api.Service) *cobra.Command {
 	return cmd
 }
 
+func FilterServices(project *types.Project, services []string) error {
+	enabled, err := project.GetServices(services...)
+	if err != nil {
+		return err
+	}
+	for _, s := range project.Services {
+		if !utils.StringContains(services, s.Name) {
+			project.DisabledServices = append(project.DisabledServices, s)
+		}
+	}
+	project.Services = enabled
+
+	return nil
+}
+
 func runPull(ctx context.Context, backend api.Service, opts pullOptions, services []string) error {
 	project, err := opts.toProject(services)
 	if err != nil {
 		return err
 	}
 
 	if !opts.includeDeps {
-		enabled, err := project.GetServices(services...)
-		if err != nil {
-			return err
-		}
-		for _, s := range project.Services {
-			if !utils.StringContains(services, s.Name) {
-				project.DisabledServices = append(project.DisabledServices, s)
-			}
-		}
-		project.Services = enabled
+		FilterServices(project, services)
 	}
 
 	return backend.Pull(ctx, project, api.PullOptions{

diff --git a/cmd/compose/push.go b/cmd/compose/push.go
@@ -22,7 +22,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/utils"
 )
 
 type pushOptions struct {
@@ -59,16 +58,7 @@ func runPush(ctx context.Context, backend api.Service, opts pushOptions, service
 	}
 
 	if !opts.IncludeDeps {
-		enabled, err := project.GetServices(services...)
-		if err != nil {
-			return err
-		}
-		for _, s := range project.Services {
-			if !utils.StringContains(services, s.Name) {
-				project.DisabledServices = append(project.DisabledServices, s)
-			}
-		}
-		project.Services = enabled
+		FilterServices(project, services)
 	}
 
 	return backend.Push(ctx, project, api.PushOptions{

diff --git a/docs/reference/docker_compose_push.yaml b/docs/reference/docker_compose_push.yaml
@@ -33,6 +33,16 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
+    - option: include-deps
+      value_type: bool
+      default_value: "false"
+      description: Also push images of services declared as dependencies
+      deprecated: false
+      hidden: false
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
     - option: quiet
       shorthand: q
       value_type: bool