Updated dockerfiles with a common base