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

Ensure down continues (removes networks) even if containers have been removed already #1021

Merged
merged 1 commit into from
Dec 7, 2020
Merged

Ensure down continues (removes networks) even if containers have been removed already #1021

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions local/compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ func (s *composeService) Down(ctx context.Context, projectName string) error {
w := progress.ContextWriter(ctx)

project, err := s.projectFromContainerLabels(ctx, projectName)
if err != nil || project == nil {
if err != nil {
return err
}

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