Use new-style docker_build command, do some minor improvements