Merge "add support for proxy in docker"