Docker fix timeout

Fix #963 

See #963  or commit messages for more details. 
You should probably log something here.
Also what's the typical timeout ? 
If it timeouts once should we assume that it would timeout every time so we don't have to try it every time ?