mirror of https://github.com/docker/compose.git
fix: bring up services with deps with --no-deps
Don't fail on not finding dependent services because they were put in the disabled slice. Fixes #9427. Signed-off-by: Nick Sieger <nick@nicksieger.com>
This commit is contained in:
parent
5b6b674da9
commit
cacff89cef
pkg
|
@ -183,7 +183,11 @@ func prepareServicesDependsOn(p *types.Project) error {
|
||||||
if service.DependsOn == nil {
|
if service.DependsOn == nil {
|
||||||
service.DependsOn = make(types.DependsOnConfig)
|
service.DependsOn = make(types.DependsOnConfig)
|
||||||
}
|
}
|
||||||
deps, err := p.GetServices(dependencies...)
|
|
||||||
|
// Verify dependencies exist in the project, whether disabled or not
|
||||||
|
projAllServices := types.Project{}
|
||||||
|
projAllServices.Services = p.AllServices()
|
||||||
|
deps, err := projAllServices.GetServices(dependencies...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -131,6 +131,12 @@ func TestStartStopWithDependencies(t *testing.T) {
|
||||||
assert.Assert(t, strings.Contains(res.Combined(), "e2e-start-stop-with-dependencies-foo-1"), res.Combined())
|
assert.Assert(t, strings.Contains(res.Combined(), "e2e-start-stop-with-dependencies-foo-1"), res.Combined())
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("Up no-deps", func(t *testing.T) {
|
||||||
|
_ = c.RunDockerComposeCmd("--project-name", projectName, "down")
|
||||||
|
res := c.RunDockerComposeCmd("-f", "./fixtures/dependencies/compose.yaml", "--project-name", projectName, "up", "--no-deps", "-d", "foo")
|
||||||
|
assert.Assert(t, strings.Contains(res.Combined(), "Container e2e-start-stop-with-dependencies-foo-1 Started"), res.Combined())
|
||||||
|
})
|
||||||
|
|
||||||
t.Run("down", func(t *testing.T) {
|
t.Run("down", func(t *testing.T) {
|
||||||
_ = c.RunDockerComposeCmd("--project-name", projectName, "down")
|
_ = c.RunDockerComposeCmd("--project-name", projectName, "down")
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue