зеркало из https://github.com/microsoft/docker.git
Merge pull request #4723 from vieux/fix_panic_monitor
fix panic in monitor
This commit is contained in:
Коммит
dd040c9870
|
@ -797,7 +797,7 @@ func (container *Container) monitor(callback execdriver.StartCallback) error {
|
|||
utils.Errorf("Error running container: %s", err)
|
||||
}
|
||||
|
||||
if container.runtime.srv.IsRunning() {
|
||||
if container.runtime != nil && container.runtime.srv != nil && container.runtime.srv.IsRunning() {
|
||||
container.State.SetStopped(exitCode)
|
||||
|
||||
// FIXME: there is a race condition here which causes this to fail during the unit tests.
|
||||
|
|
Загрузка…
Ссылка в новой задаче