Merge pull request #436 from tstorch/docker-update

docker dev block update
Use variables, when the're there

Why not use the environment variables, when they are there...