tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-15 17:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1522 from defyrlt/1112-ecs-exit-1-on-old-cfm-events

Browse Source 
Ignore previous CFM events on update to avoid false positive errors
This commit is contained in:
Nicolas De loof 2021-04-12 12:39:08 +02:00 committed by GitHub
commit aaf662b7ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ecs/up.go
View File

@ -93,6 +93,16 @@ func (b *ecsAPIService) Up(ctx context.Context, project *types.Project, options
if err != nil { if err != nil {
return err return err
} }
var previousEvents []string
if update {
var err error
previousEvents, err = b.previousStackEvents(ctx, project.Name)
if err != nil {
return err
}
}
operation := stackCreate operation := stackCreate
if update { if update {
operation = stackUpdate operation = stackUpdate
@ -121,6 +131,6 @@ func (b *ecsAPIService) Up(ctx context.Context, project *types.Project, options
b.Down(ctx, project.Name, compose.DownOptions{}) // nolint:errcheck b.Down(ctx, project.Name, compose.DownOptions{}) // nolint:errcheck
}() }()
err = b.WaitStackCompletion(ctx, project.Name, operation) err = b.WaitStackCompletion(ctx, project.Name, operation, previousEvents...)
return err return err
} }