mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Reduce the Destroy timeout from 10 to 3 seconds
This commit is contained in:
parent
483c942520
commit
28fd289b44
2 changed files with 2 additions and 1 deletions
|
@ -187,7 +187,7 @@ func (runtime *Runtime) Destroy(container *Container) error {
|
|||
return fmt.Errorf("Container %v not found - maybe it was already destroyed?", container.Id)
|
||||
}
|
||||
|
||||
if err := container.Stop(10); err != nil {
|
||||
if err := container.Stop(3); err != nil {
|
||||
return err
|
||||
}
|
||||
if mounted, err := container.Mounted(); err != nil {
|
||||
|
|
|
@ -497,6 +497,7 @@ func (srv *Server) ContainerAttach(name string, logs, stream, stdin, stdout, std
|
|||
if container == nil {
|
||||
return fmt.Errorf("No such container: %s", name)
|
||||
}
|
||||
|
||||
//logs
|
||||
if logs {
|
||||
if stdout {
|
||||
|
|
Loading…
Reference in a new issue