tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

pass QuietOption when starting dependencies from run command

Browse Source 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
This commit is contained in:
Guillaume Lours 2024-02-19 10:51:13 +01:00 committed by Nicolas De loof
parent 9630cc5808
commit 94246f3cac
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/compose/run.go
View File

@ -231,7 +231,7 @@ func runRun(ctx context.Context, backend api.Service, project *types.Project, op
} }
buildForDeps = &bo buildForDeps = &bo
} }
return startDependencies(ctx, backend, *project, buildForDeps, options.Service, options.ignoreOrphans) return startDependencies(ctx, backend, *project, buildForDeps, options)
}, dockerCli.Err()) }, dockerCli.Err())
if err != nil { if err != nil {
return err return err
@ -298,11 +298,11 @@ func runRun(ctx context.Context, backend api.Service, project *types.Project, op
return err 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{} dependencies := types.Services{}
var requestedService types.ServiceConfig var requestedService types.ServiceConfig
for name, service := range project.Services { for name, service := range project.Services {
if name != requestedServiceName { if name != options.Service {
dependencies[name] = service dependencies[name] = service
} else { } else {
requestedService = service requestedService = service
@ -310,10 +310,11 @@ func startDependencies(ctx context.Context, backend api.Service, project types.P
} }
project.Services = dependencies project.Services = dependencies
project.DisabledServices[requestedServiceName] = requestedService project.DisabledServices[options.Service] = requestedService
err := backend.Create(ctx, &project, api.CreateOptions{ err := backend.Create(ctx, &project, api.CreateOptions{
Build: buildOpts, Build: buildOpts,
IgnoreOrphans: ignoreOrphans, IgnoreOrphans: options.ignoreOrphans,
QuietPull: options.quietPull,
}) })
if err != nil { if err != nil {
return err return err

9
pkg/e2e/compose_run_test.go
View File

@ -160,4 +160,13 @@ func TestLocalComposeRun(t *testing.T) {
c.RunDockerComposeCmd(t, "-f", "./fixtures/dependencies/deps-not-required.yaml", "down", "--remove-orphans") 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())
})
} }