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