tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken build on master 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2020-06-15 11:25:52 +02:00
parent 1bb95134f0
commit dcf84f2499
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ecs/pkg/amazon/backend/down.go
View File

@ -8,17 +8,21 @@ import (
)
func (b *Backend) Down(ctx context.Context, options compose.ProjectOptions) error {
project, err := compose.ProjectFromOptions(&options)
name := options.Name
if name == "" {
project, err := compose.ProjectFromOptions(&options)
if err != nil {
return err
}
name = project.Name
}
err := b.api.DeleteStack(ctx, name)
if err != nil {
return err
}
err = b.api.DeleteStack(ctx, project.Name)
if err != nil {
return err
}
err = b.WaitStackCompletion(ctx, project.Name, types.StackDelete)
err = b.WaitStackCompletion(ctx, name, types.StackDelete)
if err != nil {
return err
}