pass QuietOption when starting dependencies from run command

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
docker · Feb 19, 2024 · 6b98fa1 · 6b98fa1
1 parent 9630cc5
commit 6b98fa1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/cmd/compose/run.go b/cmd/compose/run.go
@@ -231,7 +231,7 @@ func runRun(ctx context.Context, backend api.Service, project *types.Project, op
 			}
 			buildForDeps = &bo
 		}
-		return startDependencies(ctx, backend, *project, buildForDeps, options.Service, options.ignoreOrphans)
+		return startDependencies(ctx, backend, *project, buildForDeps, options)
 	}, dockerCli.Err())
 	if err != nil {
 		return err
@@ -298,22 +298,23 @@ func runRun(ctx context.Context, backend api.Service, project *types.Project, op
 	return err
 }
 
-func startDependencies(ctx context.Context, backend api.Service, project types.Project, buildOpts *api.BuildOptions, requestedServiceName string, ignoreOrphans bool) error {
+func startDependencies(ctx context.Context, backend api.Service, project types.Project, buildOpts *api.BuildOptions, options runOptions) error {
 	dependencies := types.Services{}
 	var requestedService types.ServiceConfig
 	for name, service := range project.Services {
-		if name != requestedServiceName {
+		if name != options.Service {
 			dependencies[name] = service
 		} else {
 			requestedService = service
 		}
 	}
 
 	project.Services = dependencies
-	project.DisabledServices[requestedServiceName] = requestedService
+	project.DisabledServices[options.Service] = requestedService
 	err := backend.Create(ctx, &project, api.CreateOptions{
 		Build:         buildOpts,
-		IgnoreOrphans: ignoreOrphans,
+		IgnoreOrphans: options.ignoreOrphans,
+		QuietPull:     options.quietPull,
 	})
 	if err != nil {
 		return err

diff --git a/pkg/e2e/compose_run_test.go b/pkg/e2e/compose_run_test.go
@@ -160,4 +160,13 @@ func TestLocalComposeRun(t *testing.T) {
 
 		c.RunDockerComposeCmd(t, "-f", "./fixtures/dependencies/deps-not-required.yaml", "down", "--remove-orphans")
 	})
+
+	t.Run("--quiet-pull", func(t *testing.T) {
+		res := c.RunDockerComposeCmd(t, "-f", "./fixtures/run-test/compose.yaml", "down", "--rmi", "all")
+		res.Assert(t, icmd.Success)
+
+		res = c.RunDockerComposeCmd(t, "-f", "./fixtures/run-test/compose.yaml", "run", "--quiet-pull", "back")
+		assert.Assert(t, !strings.Contains(res.Combined(), "Pull complete"), res.Combined())
+		assert.Assert(t, strings.Contains(res.Combined(), "Pulled"), res.Combined())
+	})
 }