Skip to content

Commit 335decc

Browse files
authored
Merge pull request docker#9504 from docker/nicksieger/9427
fix: bring up services with deps with --no-deps
2 parents 6756732 + 28c0fbf commit 335decc

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

pkg/compose/create.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,11 @@ func prepareServicesDependsOn(p *types.Project) error {
183183
if service.DependsOn == nil {
184184
service.DependsOn = make(types.DependsOnConfig)
185185
}
186-
deps, err := p.GetServices(dependencies...)
186+
187+
// Verify dependencies exist in the project, whether disabled or not
188+
projAllServices := types.Project{}
189+
projAllServices.Services = p.AllServices()
190+
deps, err := projAllServices.GetServices(dependencies...)
187191
if err != nil {
188192
return err
189193
}

pkg/e2e/fixtures/links/compose.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
services:
2+
foo:
3+
image: nginx:alpine
4+
links:
5+
- bar
6+
7+
bar:
8+
image: nginx:alpine

pkg/e2e/start_stop_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,13 @@ func TestStartStopWithDependencies(t *testing.T) {
131131
assert.Assert(t, strings.Contains(res.Combined(), "e2e-start-stop-with-dependencies-foo-1"), res.Combined())
132132
})
133133

134+
t.Run("Up no-deps links", func(t *testing.T) {
135+
_ = c.RunDockerComposeCmd("--project-name", projectName, "down")
136+
res := c.RunDockerComposeCmd("-f", "./fixtures/links/compose.yaml", "--project-name", projectName, "up", "--no-deps", "-d", "foo")
137+
assert.Assert(t, strings.Contains(res.Combined(), "Container e2e-start-stop-with-dependencies-foo-1 Started"), res.Combined())
138+
assert.Assert(t, !strings.Contains(res.Combined(), "Container e2e-start-stop-with-dependencies-bar-1 Started"), res.Combined())
139+
})
140+
134141
t.Run("down", func(t *testing.T) {
135142
_ = c.RunDockerComposeCmd("--project-name", projectName, "down")
136143
})

0 commit comments

Comments
 (0)