Addressing Docker review comments
WIP: DockerInfo