Merge pull request #2110 from apache/fix_build_docker_image

Fix Build and Verify Docker Image test