More refactor of docker abstraction to remove use of parent script defaults, and implement better paramtetrization