SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Marc-Danie NazaireMarc-Danie Nazaire
014a3f62048SHRINE2020-974 - Get Kafka running in docker dev - Updated README
Marc-Danie NazaireMarc-Danie Nazaire
a51d5b515baSHRINE2020-974 - Get Kafka running in docker dev - Updated README
Marc-Danie NazaireMarc-Danie Nazaire
27ac78cfa23SHRINE2020-974 - Get Kafka running in docker dev - Added link to Offset Explorer to README
Marc-Danie NazaireMarc-Danie Nazaire
2b030bee2bbSHRINE2020-974 - Get Kafka running in docker dev - Added topic creation to README
Marc-Danie NazaireMarc-Danie Nazaire
edb323120afSHRINE2020-979 - Allow csv input for the category definition file for the Lucene indexer - Cleared unneeded comments
Marc-Danie NazaireMarc-Danie Nazaire
1a1e2c1bfe6SHRINE2020-979 - Allow csv input for the category definition file for the Lucene indexer - Fixed QepServiceTest
Marc-Danie NazaireMarc-Danie Nazaire
9fe259fa664SHRINE2020-979 - Allow csv input for the category definition file for the Lucene indexer - Fixed QepServiceTest
Marc-Danie NazaireMarc-Danie Nazaire
6307aeeb9b9SHRINE2020-979 - Allow csv input for the category definition file for the Lucene indexer
Marc-Danie NazaireMarc-Danie Nazaire
9c9738597ceMore docker README format fix
Marc-Danie NazaireMarc-Danie Nazaire
786e0d4eb1dMore docker README format fix
Marc-Danie NazaireMarc-Danie Nazaire
f9ef51f11f5More docker README format fix
Marc-Danie NazaireMarc-Danie Nazaire
d3143a2b7dbMore docker README format fix
Marc-Danie NazaireMarc-Danie Nazaire
e82dd85af45More docker README format fix
Marc-Danie NazaireMarc-Danie Nazaire
bfcd8bdb039Docker README format fix
Marc-Danie NazaireMarc-Danie Nazaire
5304156eb8cDocker README format fix
David WalendDavid Walend
63f3c6d4e84Merge pull request #1216 in SHRINE/shrine from SHRINE2020-971 to AwsSqsPrototype * commit '064a0b21a3650ffb862e63b7e...
dwalenddwalend
7ae3163249eAdded prefix and simplified naming a bit for SHRINE2020-994
dwalenddwalend
0c640324f57Import clean up for SHRINE2020-978
dwalenddwalend
e6db18bea4dAdded per-query FIFO for SHRINE2020-978
dwalenddwalend
fa85bd438edGot FIFO queues working for SHRINE2020-978
Marc-Danie NazaireMarc-Danie Nazaire
52f44026d1eSHRINE2020-974 - Get Kafka running in docker dev - Added README
Marc-Danie NazaireMarc-Danie Nazaire
5e405c6fed5SHRINE2020-974 - Get Kafka running in docker dev - Two node kafka cluster
Marc-Danie NazaireMarc-Danie Nazaire
61e871342eeSHRINE2020-974 - Get Kafka running in docker dev - Added zookeeper properties file
Marc-Danie NazaireMarc-Danie Nazaire
404baaa344cSHRINE2020-974 - Get Kafka running in docker dev - updated .dockerignore file
Marc-Danie NazaireMarc-Danie Nazaire
fa9b26e2490SHRINE2020-974 - Get Kafka running in docker dev - removed duplicate commands
Marc-Danie NazaireMarc-Danie Nazaire
f04c28e14bbmodified to use table_cd header name to find RootInfo terms
Marc-Danie NazaireMarc-Danie Nazaire
a3cffa1c7b1SHRINE2020-974 - Get Kafka running in docker dev - Kakfa setup without using docker Kafka or zookeeper base images
Marc-Danie NazaireMarc-Danie Nazaire
449d095132bSHRINE2020-974 - Get Kafka running in docker dev
Marc-Danie NazaireMarc-Danie Nazaire
aff5beb3d5fMerge pull request #1215 in SHRINE/shrine from feature/SHRINE2020-972 to develop * commit '0e77bbb6a883bf20b0c7e3802...
Marc-Danie NazaireMarc-Danie Nazaire
0e77bbb6a88SHRINE2020-972 - Complete the remaining steps for open source ontology index service - Updated README with more detai...
dwalenddwalend
064a0b21a36Untangled queue names for SHRINE2020-971
dwalenddwalend
d04fe8d65baMoved the long polls for messages to an appropriate execution context for SHRINE2020-971
Marc-Danie NazaireMarc-Danie Nazaire
37dda08e18dSHRINE2020-972 - Complete the remaining steps for open source ontology index service - Updated README
Marc-Danie NazaireMarc-Danie Nazaire
b974afdebacSHRINE2020-972 - Complete the remaining steps for open source ontology index service - Updated README
Marc-Danie NazaireMarc-Danie Nazaire
f799106b49eSHRINE2020-972 - Complete the remaining steps for open source ontology index service - Minor re-organization of the R...
Marc-Danie NazaireMarc-Danie Nazaire
f654baa7c2cSHRINE2020-972 - Complete the remaining steps for open source ontology index service - Updated README
Marc-Danie NazaireMarc-Danie Nazaire
82df3a25a13SHRINE2020-972 - Complete the remaining steps for open source ontology index service - Updated README
David WalendDavid Walend
6f08f9c6da9Merge pull request #1214 in SHRINE/shrine from feature/SHRINE2020-967 to AwsSqsPrototype * commit '3e0eeb98382612631...
Marc-Danie NazaireMarc-Danie Nazaire
83caf701c9aSHRINE2020-972 - Complete the remaining steps for open source ontology index service - Updated README
dwalenddwalend
769a589f20cGot shrine working with AWS SQS for SHRINE2020-971
Marc-Danie NazaireMarc-Danie Nazaire
8676a27576fSHRINE2020-972 - Complete the remaining steps for open source ontology index service - Updated README
Marc-Danie NazaireMarc-Danie Nazaire
ab1fc78dd98SHRINE2020-972 - Complete the remaining steps for open source ontology index service - Updated README
Marc-Danie NazaireMarc-Danie Nazaire
625efd64372SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Renamed java.net...
Marc-Danie NazaireMarc-Danie Nazaire
320f9704123Merge pull request #1212 in SHRINE/shrine from feature/SHRINE2020-959 to develop * commit 'ff6553cd20f7b7afa0ead7c22...
David WalendDavid Walend
e8b00695350Merge pull request #1213 in SHRINE/shrine from SHRINE2020-970 to AwsSqsPrototype * commit '81ca0c7a668efe1b422ebfe3f...
dwalenddwalend
3e0eeb98382More review from Marc-Danie for SHRINE2020-967
Marc-Danie NazaireMarc-Danie Nazaire
ff6553cd20fSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Fixed typo
dwalenddwalend
ebbb87910b7Marc-Danie's review comments plus my own low opinion of some of these things for SHRINE2020-967
Marc-Danie NazaireMarc-Danie Nazaire
2fd21246bebSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Added comment re...
dwalenddwalend
296feb0c1acGot command-line test working with AWS SQS for SHRINE2020-967
Marc-Danie NazaireMarc-Danie Nazaire
81e7a76881dSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Fixed custom lif...
Marc-Danie NazaireMarc-Danie Nazaire
e7c3fcf5b81SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Added docker/cus...
dwalenddwalend
7014aa9992cBulk of the coding to send messages via AWS SQS for SHRINE2020-967
Marc-Danie NazaireMarc-Danie Nazaire
e85004ac42bSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Changed package ...
dwalenddwalend
26d547f03b1Added the shim of code to make all the URL names safe for SHRINE2020-967
dwalenddwalend
81ca0c7a668Tidying up for code review for SHRINE2020-970
dwalenddwalend
ae9d5886755Changed the MOM API to avoid contravariance for SHRINE2020-970
dwalenddwalend
0eb2d041d19Setting up a subticket for a separate pull request
Marc-Danie NazaireMarc-Danie Nazaire
acf8edddb3aSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Fixed version of...
Marc-Danie NazaireMarc-Danie Nazaire
3dc904e96c9SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - clean up maven d...
Marc-Danie NazaireMarc-Danie Nazaire
9b17aaae8cdSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - clean up maven d...
Marc-Danie NazaireMarc-Danie Nazaire
96cb1df3825SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - more edits to RE...
Marc-Danie NazaireMarc-Danie Nazaire
2b5d7c67c2cSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - minor edit to RE...
Marc-Danie NazaireMarc-Danie Nazaire
59f15779d1aSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - minor edit to RE...
Marc-Danie NazaireMarc-Danie Nazaire
25733d24502SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - minor edit to RE...
Marc-Danie NazaireMarc-Danie Nazaire
b3a99459583SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - minor edit to RE...
Marc-Danie NazaireMarc-Danie Nazaire
2c499bec741SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - minor edit to RE...
Marc-Danie NazaireMarc-Danie Nazaire
3f6408c06d5SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - add link to defa...
Marc-Danie NazaireMarc-Danie Nazaire
b9d48db17b1SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - added push image...
Marc-Danie NazaireMarc-Danie Nazaire
f2270908626SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - fixed buildAllIm...
dwalenddwalend
e2269bcd646Added parts for fs2-aws for SHRINE2020-967
Marc-Danie NazaireMarc-Danie Nazaire
9ffee5fd7eaSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - fixed buildShrin...
Marc-Danie NazaireMarc-Danie Nazaire
4dd15266855SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - fixed buildShrin...
Marc-Danie NazaireMarc-Danie Nazaire
9e51f24b156SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - fixed extra exec...
Marc-Danie NazaireMarc-Danie Nazaire
1e6a9bdb55fSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - minor text edits
Marc-Danie NazaireMarc-Danie Nazaire
862888afd7fSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Added buildAll a...
Marc-Danie NazaireMarc-Danie Nazaire
c4793c640aeSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - minor edits and ...
Marc-Danie NazaireMarc-Danie Nazaire
b7bd6e74347Merge pull request #1209 in SHRINE/shrine from feature/SHRINE2020-957 to develop * commit '80e6fbc647dada45e4f23a084...
Marc-Danie NazaireMarc-Danie Nazaire
0b92842b40dSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Added more phase...
Marc-Danie NazaireMarc-Danie Nazaire
acc9f3dcf59SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Custom maven lif...
Marc-Danie NazaireMarc-Danie Nazaire
91124dcf009SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Moved to directo...
Marc-Danie NazaireMarc-Danie Nazaire
52d206377caSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Push images to l...
Marc-Danie NazaireMarc-Danie Nazaire
b43d72b9ebaSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - Push images to l...
Marc-Danie NazaireMarc-Danie Nazaire
51b27efbd67SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - removed referenc...
Marc-Danie NazaireMarc-Danie Nazaire
19799f83d1bMerge branch 'feature/SHRINE2020-957' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
80e6fbc647dSHRINE2020-957 - Extend i2b2 docker image - Removed common directory
Marc-Danie NazaireMarc-Danie Nazaire
0bdf9fe935bSHRINE2020-957 - Extend i2b2 docker image - Removed common directory
Marc-Danie NazaireMarc-Danie Nazaire
ad4fd276ce3SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build - disable docker i...
David WalendDavid Walend
74d973a1dceMerge pull request #1211 in SHRINE/shrine from feature/SHRINE2020-956 to develop * commit '7f3493cb9e1645b4bc7a5f3f3...
Marc-Danie NazaireMarc-Danie Nazaire
2b121574e05SHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build
Marc-Danie NazaireMarc-Danie Nazaire
35f63ab5f6eSHRINE2020-959 - Figure out how to produce docker images (properly versioned) with our maven build
Marc-Danie NazaireMarc-Danie Nazaire
0712d767835Modified to build the secret aggregator app and war
dwalenddwalend
7f3493cb9e1Review comments from Marc-Danie for SHRINE2020-956
dwalenddwalend
7e309e442c0Parking SHRINE2020-681 this to work on MOM
Marc-Danie NazaireMarc-Danie Nazaire
22df2b49466Merge branch 'feature/SHRINE2020-957' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
dwalenddwalend
b2b93b5e1d1todo sweep for SHRINE2020-956
Marc-Danie NazaireMarc-Danie Nazaire
b316e3676caSHRINE2020-957 - Extend i2b2 docker image - Removed comments
Marc-Danie NazaireMarc-Danie Nazaire
f4f9669196eMerge pull request #1210 in SHRINE/shrine from feature/SHRINE2020-930 to secretAggregatorPrototype * commit 'b368584...
Marc-Danie NazaireMarc-Danie Nazaire
b368584a08aSHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Removed SecreAggregatorSe...
Marc-Danie NazaireMarc-Danie Nazaire
15a4ce13f48SHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Removed SecreAggregatorSe...
dwalenddwalend
e29a8a7308fOnly verify signatures when configured for SHRINE2020-956
dwalenddwalend
d43d4eb0d1aMade signing queries opt-out by config for SHRINE2020-956
dwalenddwalend
b61bbf758c3Made myEntry an Option to let me make a DoNotSignDoNotVerify cert collection for SHRINE2020-956
dwalenddwalend
5ef990f9799Moved commonName into cert collection for SHRINE2020-956
dwalenddwalend
fe9f562ec36Removing unused vars for SHRINE2020-956
Marc-Danie NazaireMarc-Danie Nazaire
7d5e8b623ffSHRINE2020-957 - Extend i2b2 docker image - Set url to secret aggregator service in shrine.conf and enabled tomcat re...
Marc-Danie NazaireMarc-Danie Nazaire
477fa5b840fSHRINE2020-957 - Extend i2b2 docker image -Added shrine db update scripts and fixed default topic
David WalendDavid Walend
a361851e9cbMerge pull request #1208 in SHRINE/shrine from feature/SHRINE2020-887 to develop * commit 'cdb30b6cec4654ebe2cee7a07...
Marc-Danie NazaireMarc-Danie Nazaire
1c76bd83681SHRINE2020-957 - Extend i2b2 docker image - Updated README
Marc-Danie NazaireMarc-Danie Nazaire
e3c8c1f0d23Merge branch 'secretAggregatorPrototype' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SH...
Marc-Danie NazaireMarc-Danie Nazaire
f0ca883feb4SHRINE2020-957 - Extend i2b2 docker image - Updated README
Marc-Danie NazaireMarc-Danie Nazaire
c65e37a353aSHRINE2020-957 - Extend i2b2 docker image - Minor line spacing edits
Marc-Danie NazaireMarc-Danie Nazaire
1808f196368SHRINE2020-957 - Extend i2b2 docker image - Add default values for environment variables in the shrine i2b2 wildlfy i...
Marc-Danie NazaireMarc-Danie Nazaire
fd90ba09bb5SHRINE2020-957 - Extend i2b2 docker image - Updated README
dwalenddwalend
83599a35706Lining up the next refactor for SHRINE2020-956
Marc-Danie NazaireMarc-Danie Nazaire
74379872c09SHRINE2020-957 - Extend i2b2 docker image
David WalendDavid Walend
dbefc125460Merge pull request #1207 in SHRINE/shrine from feature/SHRINE2020-937 to secretAggregatorPrototype * commit 'f8df2f3...
dwalenddwalend
20ed3c81816Some consolidation to start making signing queries optional for SHRINE2020-956
David WalendDavid Walend
a9407c2e068Merge pull request #1206 in SHRINE/shrine from feature/SHRINE2020-944 to secretAggregatorPrototype * commit '671868c...
Marc-Danie NazaireMarc-Danie Nazaire
2281c086274Merge pull request #1199 in SHRINE/shrine from feature/SHRINE2020-929 to develop * commit '4b2044904734caabeabd4e9aa...
Marc-Danie NazaireMarc-Danie Nazaire
b015fde5b70Merge branch 'secretAggregatorPrototype' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SH...
Marc-Danie NazaireMarc-Danie Nazaire
a3562442e96Merge branch 'feature/SHRINE2020-929' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
dwalenddwalend
76afc4593baPlanning and some cleanup for SHRINE2020-956
Marc-Danie NazaireMarc-Danie Nazaire
4b204490473SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to used environment variables ...
Marc-Danie NazaireMarc-Danie Nazaire
c43087a959dSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to used environment variables ...
David WalendDavid Walend
76e27efda24Merge pull request #1205 in SHRINE/shrine from feature/SHRINE2020-938 to secretAggregatorPrototype * commit 'b260487...
David WalendDavid Walend
af17702b841Merge pull request #1204 in SHRINE/shrine from feature/SHRINE2020-939-the-qep-stores-the-encoded-count-alongside-the-...
dwalenddwalend
cdb30b6cec4Upgraded http4s to 0.21.28 for SHRINE2020-887
Marc-Danie NazaireMarc-Danie Nazaire
8d8da5d2962SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - minor edit to setenv.sh
Marc-Danie NazaireMarc-Danie Nazaire
05facbd59c9SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Moved password.conf to the docker-compo...
Marc-Danie NazaireMarc-Danie Nazaire
eaa2040c4cdSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Moved shrine-node Dockerfile, removed h...
Marc-Danie NazaireMarc-Danie Nazaire
92186d230daSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to used environment variables ...
Marc-Danie NazaireMarc-Danie Nazaire
0a2a24dfb4eSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - moved location of password.conf
Marc-Danie NazaireMarc-Danie Nazaire
904d8dbfdc2SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - removed unneeded context.xml file copies
Marc-Danie NazaireMarc-Danie Nazaire
f7d893a3d79SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Moved location of the i2b2 files
Marc-Danie NazaireMarc-Danie Nazaire
8332c8c92eeSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to use the same context.xml fi...
Marc-Danie NazaireMarc-Danie Nazaire
8606723e2baSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to use the same context.xml fi...
Marc-Danie NazaireMarc-Danie Nazaire
c7a4067a162SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to use the same context.xml fi...
Marc-Danie NazaireMarc-Danie Nazaire
e2ac3602ad4SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - renamed common/node to common/shrine-node
Marc-Danie NazaireMarc-Danie Nazaire
1caa3f0efcbSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Changed base docker image from frapsoft...
dwalenddwalend
f8df2f36c38Added some nice text for the exact answer for SHRINE2020-937
Marc-Danie NazaireMarc-Danie Nazaire
215f9d7eb42Merge branch 'secretAggregatorPrototype' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SH...
dwalenddwalend
671868c2862Merge branch 'feature/SHRINE2020-938' into feature/SHRINE2020-944
dwalenddwalend
b2604879446Fixing mssql add column maybe - for SHRINE2020-938
dwalenddwalend
f48f64a281bFixing mssql add column maybe - for SHRINE2020-938
David WalendDavid Walend
ad5886ab944Merge pull request #1203 in SHRINE/shrine from feature/SHRINE2020-943 to secretAggregatorPrototype * commit '3eac10f...
dwalenddwalend
e59c1ec8863Restored obfuscation for SHRINE2020-944
Marc-Danie NazaireMarc-Danie Nazaire
1e92a2f1706SHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Updated to use secret agg...
Marc-Danie NazaireMarc-Danie Nazaire
cf2f3db4894Merge branch 'secretAggregatorPrototype' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SH...
Marc-Danie NazaireMarc-Danie Nazaire
d8430b548eaSHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Fixed typo
Marc-Danie NazaireMarc-Danie Nazaire
3bac6af85ffMerge branch 'feature/SHRINE2020-929' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
a309f32dd47SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Changed base docker image from tomcat:j...
dwalenddwalend
06f9d0215abGet the real sum into the QEP's data structure for SHRINE2020-938 and SHRINE2020-940
Marc-Danie NazaireMarc-Danie Nazaire
490411746faSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - README updates
Marc-Danie NazaireMarc-Danie Nazaire
0525bae0fc9Merge with develop
Marc-Danie NazaireMarc-Danie Nazaire
a43c2b2871fMerge with develop
Marc-Danie NazaireMarc-Danie Nazaire
f1fa6259131SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - removed commented out code
David WalendDavid Walend
62e6d27362aMerge pull request #1200 in SHRINE/shrine from feature/SHRINE2020-931 to develop * commit '80ef671f5a5286736c98e3e2f...
Marc-Danie NazaireMarc-Danie Nazaire
82cce2feb79SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - updated the README
Marc-Danie NazaireMarc-Danie Nazaire
70e2d3d23cfSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - updated the README
dwalenddwalend
314adc38bd9Removed stray comment for SHRINE2020-939
dwalenddwalend
cd55d7e12c3Added support for Oracle and ms sql for SHRINE2020-939
Marc-Danie NazaireMarc-Danie Nazaire
180efa62b52SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - edit path to map to shrine keystore volume
Marc-Danie NazaireMarc-Danie Nazaire
254703743c7SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - now saves shrine keystores to a volume
David WalendDavid Walend
9d2941fa839Merge pull request #1202 in SHRINE/shrine from feature/SHRINE2020-942 to secretAggregatorPrototype * commit '27d6987...
dwalenddwalend
53250d2cd61Now storing the encoded count in mysql at the QEP for SHRINE2020-939
dwalenddwalend
8a56f559580Moving secretAggregatorService to secret-aggregator - code review feedback from Marc-Danie - and added way-finding fo...
Marc-Danie NazaireMarc-Danie Nazaire
0a489208782SHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Dockerfile cleanup
Marc-Danie NazaireMarc-Danie Nazaire
eb4293ee1e7Merge branch 'feature/SHRINE2020-929' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
9f376df680aSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - cleaned up the docker compose files
Marc-Danie NazaireMarc-Danie Nazaire
14d505ca27bSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - edit volumes
Marc-Danie NazaireMarc-Danie Nazaire
62c001c5f74SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - fixed typo
Marc-Danie NazaireMarc-Danie Nazaire
a79c7896379SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - attached volume to the shrine-db in ord...
dwalenddwalend
3eac10fdcd6QUEUED query support and storage at the hub of the encoded result for SHRINE2020-943
dwalenddwalend
76ce1cbf148A little logging for SHRINE2020-943
dwalenddwalend
8e7a6da2589Found the cut/paste bug - now the services work via curl for SHRINE2020-943
Marc-Danie NazaireMarc-Danie Nazaire
27577d4ac43SHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Dockerfile cleanup
Marc-Danie NazaireMarc-Danie Nazaire
526d4935408SHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - README update
Marc-Danie NazaireMarc-Danie Nazaire
57f128a2a88SHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Dockerized the secret agg...
dwalenddwalend
f1cb1c6f622Committing some ghastly stuff to try to figure out if there's a problem with deploying via scp for SHRINE2020-943
Marc-Danie NazaireMarc-Danie Nazaire
8093a43fa8eMerge branch 'feature/SHRINE2020-929' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
fc8969edd15SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - renamed from secret to secret-aggregator
Marc-Danie NazaireMarc-Danie Nazaire
07b7dd5e0e3SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - using i2b2 environment variables
Marc-Danie NazaireMarc-Danie Nazaire
cb16015534aSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Simplified i2b2 startup
dwalenddwalend
55e9caf2553Wired up not-QUEUED queries to report a secret of 1000 for SHRINE2020-943
Marc-Danie NazaireMarc-Danie Nazaire
a358c80605cSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Decreased shutdown timeout
Marc-Danie NazaireMarc-Danie Nazaire
c0b0f92fb6cSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Moved location of execute.sh
Marc-Danie NazaireMarc-Danie Nazaire
3ef1fbe366eSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Updated log messages in execute.sh