Merge pull request #1103 from gtardif/flaky_down

ndeloof · web-flow · commit ba3b057b8ea0 · 2021-01-06T10:42:17.000+01:00
When running compose down, remove containers with Force=true
diff --git a/local/compose/down.go b/local/compose/down.go
@@ -101,7 +101,7 @@ func (s *composeService) removeContainers(ctx context.Context, w progress.Writer
 				return err
 			}
 			w.Event(progress.RemovingEvent(eventName))
-			err = s.apiClient.ContainerRemove(ctx, toDelete.ID, moby.ContainerRemoveOptions{})
+			err = s.apiClient.ContainerRemove(ctx, toDelete.ID, moby.ContainerRemoveOptions{Force: true})
 			if err != nil {
 				w.Event(progress.ErrorMessageEvent(eventName, "Error while Removing"))
 				return err

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func (s *composeService) removeContainers(ctx context.Context, w progress.Writer`
`101`	`101`	`return err`
`102`	`102`	`}`
`103`	`103`	`w.Event(progress.RemovingEvent(eventName))`
`104`		`- err = s.apiClient.ContainerRemove(ctx, toDelete.ID, moby.ContainerRemoveOptions{})`
	`104`	`+ err = s.apiClient.ContainerRemove(ctx, toDelete.ID, moby.ContainerRemoveOptions{Force: true})`
`105`	`105`	`if err != nil {`
`106`	`106`	`w.Event(progress.ErrorMessageEvent(eventName, "Error while Removing"))`
`107`	`107`	`return err`