merge the 2 Dockerfiles into one, and then use that to add git versioning information.
grab the tar info and copy it to the docker user whenever we boot
Merge pull request #328 from SvenDowideit/one-dockerfile-for-versioning

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