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

compose/run: don't waitDependencies if NoDeps

Browse Source 
Signed-off-by: aviau <alexandre@alexandreviau.net>
This commit is contained in:
aviau 2021-09-14 13:22:07 -04:00 committed by Nicolas De loof
parent f7c360b721
commit 21d3b19e57
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/compose/run.go
View File

@ -210,6 +210,7 @@ func runRun(ctx context.Context, backend api.Service, project *types.Project, op
Entrypoint: opts.entrypointCmd, Entrypoint: opts.entrypointCmd,
Labels: labels, Labels: labels,
UseNetworkAliases: opts.useAliases, UseNetworkAliases: opts.useAliases,
NoDeps: opts.noDeps,
Index: 0, Index: 0,
} }
exitCode, err := backend.RunOneOffContainer(ctx, project, runOpts) exitCode, err := backend.RunOneOffContainer(ctx, project, runOpts)

1
pkg/api/api.go
View File

@ -220,6 +220,7 @@ type RunOptions struct {
Labels types.Labels Labels types.Labels
Privileged bool Privileged bool
UseNetworkAliases bool UseNetworkAliases bool
NoDeps bool
// used by exec // used by exec
Index int Index int
} }

2
pkg/compose/run.go
View File

@ -160,9 +160,11 @@ func (s *composeService) prepareRun(ctx context.Context, project *types.Project,
if err := s.ensureImagesExists(ctx, project, false); err != nil { // all dependencies already checked, but might miss service img if err := s.ensureImagesExists(ctx, project, false); err != nil { // all dependencies already checked, but might miss service img
return "", err return "", err
} }
if !opts.NoDeps {
if err := s.waitDependencies(ctx, project, service); err != nil { if err := s.waitDependencies(ctx, project, service); err != nil {
return "", err return "", err
} }
}
created, err := s.createContainer(ctx, project, service, service.ContainerName, 1, opts.Detach && opts.AutoRemove, opts.UseNetworkAliases) created, err := s.createContainer(ctx, project, service, service.ContainerName, 1, opts.Detach && opts.AutoRemove, opts.UseNetworkAliases)
if err != nil { if err != nil {
return "", err return "", err