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

Merge pull request #8898 from ndeloof/container_restart 

better detect container will restart
This commit is contained in:
Ulysses Souza 2021-11-09 10:10:57 +01:00 committed by GitHub
parent e6599c7213 ed2395819d
commit d4e3f191ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/compose/start.go
View File

@ -115,7 +115,7 @@ func (s *composeService) watchContainers(ctx context.Context, projectName string
restarted := watched[container.ID]
watched[container.ID] = restarted + 1
// Container terminated.
willRestart := inspected.HostConfig.RestartPolicy.MaximumRetryCount > restarted
willRestart := willContainerRestart(inspected, restarted)
listener(api.ContainerEvent{
Type: api.ContainerEventExit,
@ -162,3 +162,14 @@ func (s *composeService) watchContainers(ctx context.Context, projectName string
}
return err
}
func willContainerRestart(container moby.ContainerJSON, restarted int) bool {
policy := container.HostConfig.RestartPolicy
if policy.IsAlways() || policy.IsUnlessStopped() {
return true
}
if policy.IsOnFailure() {
return container.State.ExitCode != 0 && policy.MaximumRetryCount > restarted
}
return false
}