tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 21:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

do not stop the dependencies wait process when reaching a dependency with service_started condition

Browse Source 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
This commit is contained in:
Guillaume Lours 2022-02-20 10:28:05 +01:00
parent 09e0fa94b8
commit 4be38f84df
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/compose/convergence.go
View File

@ -278,7 +278,7 @@ func (s *composeService) waitDependencies(ctx context.Context, project *types.Pr
for dep, config := range dependencies { for dep, config := range dependencies {
if config.Condition == types.ServiceConditionStarted { if config.Condition == types.ServiceConditionStarted {
// already managed by InDependencyOrder // already managed by InDependencyOrder
return nil continue
} }
if service, err := project.GetService(dep); err != nil { if service, err := project.GetService(dep); err != nil {
return err return err

10
pkg/compose/convergence_test.go
View File

@ -202,4 +202,14 @@ func TestWaitDependencies(t *testing.T) {
} }
assert.NilError(t, tested.waitDependencies(context.Background(), &project, dependencies)) assert.NilError(t, tested.waitDependencies(context.Background(), &project, dependencies))
}) })
t.Run("should skip dependencies with condition service_started", func(t *testing.T) {
dbService := types.ServiceConfig{Name: "db", Scale: 1}
redisService := types.ServiceConfig{Name: "redis", Scale: 1}
project := types.Project{Name: strings.ToLower(testProject), Services: []types.ServiceConfig{dbService, redisService}}
dependencies := types.DependsOnConfig{
"db": {Condition: types.ServiceConditionStarted},
"redis": {Condition: types.ServiceConditionStarted},
}
assert.NilError(t, tested.waitDependencies(context.Background(), &project, dependencies))
})
} }