Merge "Remove environment setup from listener dockerfile"