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

Merge pull request #1021 from gtardif/fix_down_no_containers

Browse Source 
Ensure down continues (removes networks) even if containers have been removed already
This commit is contained in:
Guillaume Tardif 2020-12-07 17:33:26 +01:00 committed by GitHub
commit 8ee2286126
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
local/compose.go
View File

@ -472,7 +472,7 @@ func (s *composeService) Down(ctx context.Context, projectName string) error {
w := progress.ContextWriter(ctx) w := progress.ContextWriter(ctx)
project, err := s.projectFromContainerLabels(ctx, projectName) project, err := s.projectFromContainerLabels(ctx, projectName)
if err != nil || project == nil { if err != nil {
return err return err
} }
@ -547,17 +547,17 @@ func (s *composeService) projectFromContainerLabels(ctx context.Context, project
if err != nil { if err != nil {
return nil, err return nil, err
} }
fakeProject := &types.Project{
Name: projectName,
}
if len(containers) == 0 { if len(containers) == 0 {
return nil, nil return fakeProject, nil
} }
options, err := loadProjectOptionsFromLabels(containers[0]) options, err := loadProjectOptionsFromLabels(containers[0])
if err != nil { if err != nil {
return nil, err return nil, err
} }
if options.ConfigPaths[0] == "-" { if options.ConfigPaths[0] == "-" {
fakeProject := &types.Project{
Name: projectName,
}
for _, container := range containers { for _, container := range containers {
fakeProject.Services = append(fakeProject.Services, types.ServiceConfig{ fakeProject.Services = append(fakeProject.Services, types.ServiceConfig{
Name: container.Labels[serviceLabel], Name: container.Labels[serviceLabel],