Changing Dockerfile build to use master branch and to build and clean-up as one step to minimize the image size