Added some support for docker env variables