Commits
Marc-Danie Nazaire authored b90062c9699M
Merge pull request #1199 in SHRINE/shrine from feature/SHRINE2020-929 to develop * commit '12c1b0902eec7fd91aaa973c32bac0efae34610e': (51 commits) 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-929 - Improve shrine dev docker-compose to be a two node network - Changed base docker image from tomcat:jdk11-openjdk to frapsoft/openssl:latest SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - README updates Merge with develop SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - removed commented out code SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - updated the README SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - updated the README ...
Showing diff to3e898ca8aef