shrine

Merge pull request #1210 in SHRINE/shrine from feature/SHRINE2020-930 to secretAggregatorPrototype

* commit 'c2fb926f28d19725dbc7c432b58fc5eef9e9db9e': (66 commits)
  SHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Removed SecreAggregatorService from shrine-api app
  SHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Removed SecreAggregatorService from shrine-api app
  SHRINE2020-957 - Extend i2b2 docker image - Set url to secret aggregator service in shrine.conf and enabled tomcat remote debugging
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to used environment variables in shrine.conf and moved context.xml, server.xml and conf files to the shrine-node image
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to used environment variables in shrine.conf and moved context.xml, server.xml and conf files to the shrine-node image
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - minor edit to setenv.sh
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Moved password.conf to the docker-compose files
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Moved shrine-node Dockerfile, removed hostname from Dockerfiles and updated README
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to used environment variables in server.xml
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - moved location of password.conf
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - removed unneeded context.xml file copies
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Moved location of the i2b2 files
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to use the same context.xml file for all shrine nodes and added docker project name as an environment variable in README
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to use the same context.xml file for all shrine nodes and added docker project name as an environment variable in README
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to use the same context.xml file for all shrine nodes and added docker project name as an environment variable in README
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - renamed common/node to common/shrine-node
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Changed base docker image from frapsoft/openssl:latest to emberstack/openssl:latest
  SHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Updated to use secret aggregator service from ticket 942
  SHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Fixed typo
  SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Changed base docker image from tomcat:jdk11-openjdk to frapsoft/openssl:latest
  ...