Made dockerenv a bit more robust