Merge pull request #118 from ravigurram8/topic-release-10

1.14.0 build updates

Author: ravigurram8

config/config.json

@@ -200,6 +200,8 @@
     "endTime": "21:10:00"
   },
   "cronJobForEodSync" : "*/60 * * * *",
+  "cronJobForSync" : "00 08 * * *",
+  "cronJobForEodPIReport": "00 10 * * *",
   "sampleCSVForUser": "users.csv",
   "sampleCSVBucketRegion": "REPLACE_WITH_REGION",
   "sessionMaxAge" : 900000

config/settings-config.json

@@ -789,7 +789,7 @@
         ],
         "action": []
       },
-      "external": {
+      "internal": {
         "connect":[
           {
             "menu": "Explore",
@@ -800,7 +800,12 @@
             "imageUrl": "../../assets/images/link@2x.png"
           }
         ],
-        "action":[]
+        "action":[
+          {
+            "action": "Edit",
+            "imageUrl": "../../assets/images/editStudy.png"
+          }
+        ]
       },
       "Personal": {
         "connect": [
@@ -876,7 +881,7 @@
       },
       {
         "key": "studyType",
-        "value": "external"
+        "value": "internal"
       },
       {
         "key": "studyType",

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - sp2net
 
   cc-3102:
-    image: 045938549113.dkr.ecr.us-east-2.amazonaws.com/researchportal:_fd_1.13.2_b1352
+    image: 045938549113.dkr.ecr.us-east-2.amazonaws.com/researchportal:_fd_1.14.0_b1444
     secrets:
       - source: sp2prod-config.json
         target: /rlc/cc/server/app/config/config.json
@@ -42,7 +42,7 @@ services:
     command: /bin/bash start.sh
 
   scheduler-3102:
-    image: 045938549113.dkr.ecr.us-east-2.amazonaws.com/researchportal:_fd_1.13.2_b1352
+    image: 045938549113.dkr.ecr.us-east-2.amazonaws.com/researchportal:_fd_1.14.2_b1444
     secrets:
       - source: sp2prod-config.json
         target: /rlc/cc/server/app/config/config.json
@@ -62,7 +62,7 @@ services:
     command: node ./app/scheduler/app.js
 
   notificationsink:
-    image: 045938549113.dkr.ecr.us-east-2.amazonaws.com/notificationsink:1.13.2_b3
+    image: 045938549113.dkr.ecr.us-east-2.amazonaws.com/notificationsink:1.14.0_b3
     secrets:
       - source: sp2prod-config.json
         target: /opt/app/config/config.json

provisioners/provision-ecr.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -xe
 sudo docker login -u AWS -p $(aws ecr get-login-password --region us-east-2) 045938549113.dkr.ecr.us-east-2.amazonaws.com
-sudo docker pull 045938549113.dkr.ecr.us-east-2.amazonaws.com/researchportal:_fd_1.13.2_b1352
+sudo docker pull 045938549113.dkr.ecr.us-east-2.amazonaws.com/researchportal:_fd_1.14.0_b1444
 sudo docker pull 045938549113.dkr.ecr.us-east-2.amazonaws.com/nginx:latest
-sudo docker pull 045938549113.dkr.ecr.us-east-2.amazonaws.com/notificationsink:1.13.2_b3
+sudo docker pull 045938549113.dkr.ecr.us-east-2.amazonaws.com/notificationsink:1.14.0_b3

rg_document_db.yml

@@ -140,7 +140,7 @@ Resources:
       MasterUsername: rguser   
       MasterUserPassword: 
         Fn::Sub: "{{resolve:secretsmanager:${DocDBClusterRotationSecret}::password}}"
-      EngineVersion: 3.6.0
+      EngineVersion: 4.0.0
       DBSubnetGroupName : !Ref DocumentDBSubnetGroup
       VpcSecurityGroupIds: 
         - !GetAtt DocumentDBSecurityGroup.GroupId
@@ -189,4 +189,4 @@ Outputs:
   ClusterPort:
     Value: !GetAtt DBCluster.Port
   EngineVersion:
-    Value: "3.6.0"
+    Value: "4.0.0"

rg_main_stack.yml

@@ -165,7 +165,7 @@ Resources:
     Type: AWS::EC2::Instance
     Properties:
       ImageId: ami-0fb3fe843311c4412
-      InstanceType: t3.medium
+      InstanceType: t3.large
       Monitoring: "true"
       DisableApiTermination: "false"
       IamInstanceProfile: