merge the 2 Dockerfiles into one, and then use that to add git versioning information.

we've been getting build issues when using the trusted build base image, and then making our own local rootfs's over the top.

this way, there is only one git version that the entire build process uses, and that information is embedded in the resultant iso.