Fixed and updated base dockerfiles

Instructions to build/run are in the pad.