Bug fixes for docker_build command.

I think I originally had it working and then started refactoring for docker_shell and never retested the refactored docker_build.