Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit 8ee2286

Browse files
authoredDec 7, 2020
Merge pull request #1021 from gtardif/fix_down_no_containers
Ensure down continues (removes networks) even if containers have been removed already
2 parents b987f2e + 2657f58 commit 8ee2286

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed
 

‎local/compose.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ func (s *composeService) Down(ctx context.Context, projectName string) error {
472472
w := progress.ContextWriter(ctx)
473473

474474
project, err := s.projectFromContainerLabels(ctx, projectName)
475-
if err != nil || project == nil {
475+
if err != nil {
476476
return err
477477
}
478478

@@ -547,17 +547,17 @@ func (s *composeService) projectFromContainerLabels(ctx context.Context, project
547547
if err != nil {
548548
return nil, err
549549
}
550+
fakeProject := &types.Project{
551+
Name: projectName,
552+
}
550553
if len(containers) == 0 {
551-
return nil, nil
554+
return fakeProject, nil
552555
}
553556
options, err := loadProjectOptionsFromLabels(containers[0])
554557
if err != nil {
555558
return nil, err
556559
}
557560
if options.ConfigPaths[0] == "-" {
558-
fakeProject := &types.Project{
559-
Name: projectName,
560-
}
561561
for _, container := range containers {
562562
fakeProject.Services = append(fakeProject.Services, types.ServiceConfig{
563563
Name: container.Labels[serviceLabel],

0 commit comments

Comments
 (0)