Use variables, when the're there

Why not use the environment variables, when they are there...
Merge pull request #437 from tstorch/docker-update

Use variables, when the're there