Adjust Dockerfile style to be more consistent

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Merge pull request #9804 from tianon/dockerfile-tweaks

Adjust Dockerfile style to be more consistent