Merge pull request #33293 from fd/patch-1

Remove deadlock in ContainerWait Upstream-commit: d98d4fa Component: engine
docker-archive · May 19, 2017 · 1dc2936 · 1dc2936
2 parents b0a3aba + 87298d4
commit 1dc2936
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/components/engine/client/container_wait.go b/components/engine/client/container_wait.go
@@ -31,7 +31,7 @@ func (cli *Client) ContainerWait(ctx context.Context, containerID string, condit
 	}
 
 	resultC := make(chan container.ContainerWaitOKBody)
-	errC := make(chan error)
+	errC := make(chan error, 1)
 
 	query := url.Values{}
 	query.Set("condition", string(condition))