Merge pull request #965 from lzjpaul/22-5-25-conda-setup

update conda and docker files for v3.3.0