Improve the Dockerfile

[allanlewis]

This PR proposes some small improvements to the Dockerfile in order to reduce the number of layers and build time, and to avoid polluting the container environment with unnecessary variables.