зеркало из https://github.com/microsoft/docker.git
Reduce the Destroy timeout from 10 to 3 seconds
This commit is contained in:
Родитель
483c942520
Коммит
28fd289b44
|
@ -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 {
|
||||
|
|
Загрузка…
Ссылка в новой задаче