Merge pull request #444 from lopter/master

Fixe the race condition between docker run and docker logs from #428
Upstream-commit: 0eb425426f47199fb5b343dcd6c5410af87f0446
Component: engine

components/engine/commands.go

@@ -975,6 +975,7 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout rcli.DockerConn, args ...s
 	}
 	Debugf("Waiting for attach to return\n")
 	<-attachErr
+	container.Wait()
 	// Expecting I/O pipe error, discarding
 	return nil
 }