Merge "Add proxy support in DockerFile"