Edits and fixes to Dockerfile Best Practices based on review feedback.
Also, dockerfile edits so that makedocs works again.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)