Patch 1

Removed buildconfig file and made some changes to your main Dockerfile that make it more consistent 

Pleace review the changes.