Updated dockerfile to better follow conventions, minimized layers & size