From 947405a90951e4715a8399410b67f4f644415d59 Mon Sep 17 00:00:00 2001 From: LK4D4 Date: Sat, 14 Jun 2014 21:08:23 +0400 Subject: [PATCH] Do inspect under container lock It fixes some race conditions Docker-DCO-1.1-Signed-off-by: Alexandr Morozov (github: LK4D4) --- daemon/inspect.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/daemon/inspect.go b/daemon/inspect.go index 4da09d5449..af6d4520fb 100644 --- a/daemon/inspect.go +++ b/daemon/inspect.go @@ -13,11 +13,13 @@ func (daemon *Daemon) ContainerInspect(job *engine.Job) engine.Status { } name := job.Args[0] if container := daemon.Get(name); container != nil { + container.Lock() + defer container.Unlock() if job.GetenvBool("dirty") { b, err := json.Marshal(&struct { *Container HostConfig *runconfig.HostConfig - }{container, container.HostConfig()}) + }{container, container.hostConfig}) if err != nil { return job.Error(err) }