Updating to use environment variables
Merge branch 'master' of https://github.com/brightsparc/suro-docker