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

Ignore previous CFM events on update to avoid false positive errors

Browse Source 
ECS `up` is pulling all events for CFM stack, which may be having some errors in
the history. For example, if CFM stack update was ever cancelled, `up` will be
exiting with code 1 on every run after that cancellation.

Fixes #1112

Signed-off-by: defyrlt <defyrlt@users.noreply.github.com>
This commit is contained in:
defyrlt 2021-04-10 01:29:57 +03:00
parent 80c82415d9
commit 85f0a7c228
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 {
return err
}
var previousEvents []string
if update {
var err error
previousEvents, err = b.previousStackEvents(ctx, project.Name)
if err != nil {
return err
}
}
operation := stackCreate
if update {
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
}()
err = b.WaitStackCompletion(ctx, project.Name, operation)
err = b.WaitStackCompletion(ctx, project.Name, operation, previousEvents...)
return err
}