Modifications to allow for docker within docker
Refactor to have base Dockerfile