Some more docker tweaks.

* Remove associated volumes
* Wait a litle but before killing the container
* Try to get the `cidfile` path from the environment first