Skip to content

Commit

Permalink
Rest of Standard 6.1.0 test changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jesdynf committed Mar 25, 2022
1 parent a083144 commit 248a7d1
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 47 deletions.
62 changes: 36 additions & 26 deletions packages/standard/cfn/OpenEMR-Standard-Recovery.json
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
{
"AWSTemplateFormatVersion": "2010-09-09",
"Description": "OpenEMR Cloud Standard v6.0.0 cloud deployment [recovery]",
"Description": "OpenEMR Cloud Standard v6.1.0 cloud deployment [recovery]",
"Mappings": {
"RegionData": {
"ap-northeast-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-2086695f"
},
"ap-northeast-2": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-d04ce5be"
},
"ap-south-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-d2bd9dbd"
},
"ap-southeast-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-2fb49f53"
},
"ap-southeast-2": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-2a459148"
},
"ca-central-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-8de666e9"
},
"eu-central-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-b105265a"
},
"eu-west-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-dd99b2a4"
},
"eu-west-2": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-96da38f1"
},
"eu-west-3": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-6c902111"
},
"sa-east-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-56e5b73a"
},
"us-east-1": {
"MySQLVersion": "5.6.39",
"OpenEMRMktPlaceAMI": "ami-a650d4d9"
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-0dfabb22610673720"
},
"us-east-2": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-f97f429c"
},
"us-west-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-f5d6c995"
},
"us-west-2": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-8b4d3af3"
}
}
Expand Down Expand Up @@ -183,11 +183,14 @@
},
"RDSInstanceSize": {
"AllowedValues": [
"db.t2.micro",
"db.t3.micro",
"db.t3.small",
"db.t2.medium",
"db.t2.large",
"db.m4.large"
"db.t3.medium",
"db.m6g.large",
"db.m6g.xlarge",
"db.r6g.large",
"db.r6g.xlarge",
"db.r6g.2xlarge"
],
"Default": "db.t3.small",
"Description": "RDS instance size for the back-end database",
Expand Down Expand Up @@ -243,10 +246,12 @@
"WebserverInstanceSize": {
"AllowedValues": [
"t3.small",
"t2.medium",
"t2.large",
"t2.xlarge",
"t2.2xlarge"
"t3.medium",
"t3.large",
"m6a.large",
"m6a.xlarge",
"m6i.large",
"m6i.xlarge"
],
"Default": "t3.small",
"Description": "EC2 instance size for the webserver",
Expand Down Expand Up @@ -671,6 +676,11 @@
]
},
"\n",
"DVOL=",
{
"Ref": "DockerVolume"
},
"\n",
"RECOVERYS3=",
{
"Ref": "RecoveryS3Bucket"
Expand Down Expand Up @@ -701,7 +711,7 @@
" openemr:\n",
" restart: always\n",
" image: openemr/openemr",
":6.0.0",
":6.1.0",
"\n",
" ports:\n",
" - 80:80\n",
Expand Down
47 changes: 26 additions & 21 deletions packages/standard/cfn/OpenEMR-Standard.json
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
{
"AWSTemplateFormatVersion": "2010-09-09",
"Description": "OpenEMR Cloud Standard v6.0.0 cloud deployment",
"Description": "OpenEMR Cloud Standard v6.1.0 cloud deployment",
"Mappings": {
"RegionData": {
"ap-northeast-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-2086695f"
},
"ap-northeast-2": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-d04ce5be"
},
"ap-south-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-d2bd9dbd"
},
"ap-southeast-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-2fb49f53"
},
"ap-southeast-2": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-2a459148"
},
"ca-central-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-8de666e9"
},
"eu-central-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-b105265a"
},
"eu-west-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-dd99b2a4"
},
"eu-west-2": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-96da38f1"
},
"eu-west-3": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-6c902111"
},
"sa-east-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-56e5b73a"
},
"us-east-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-0dfabb22610673720"
},
"us-east-2": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-f97f429c"
},
"us-west-1": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-f5d6c995"
},
"us-west-2": {
"MySQLVersion": "5.6.39",
"MySQLVersion": "5.7.33",
"OpenEMRMktPlaceAMI": "ami-8b4d3af3"
}
}
Expand Down Expand Up @@ -255,10 +255,10 @@
"WebserverInstanceSize": {
"AllowedValues": [
"t3.small",
"t2.medium",
"t2.large",
"t2.xlarge",
"t2.2xlarge",
"t3.medium",
"t3.large",
"t3.xlarge",
"t3.2xlarge",
"m5.large",
"m5.xlarge",
"m5.2xlarge",
Expand Down Expand Up @@ -727,6 +727,11 @@
{
"Ref": "OpenEMRKey"
},
"\n",
"DVOL=",
{
"Ref": "DockerVolume"
},
"\n"
]
]
Expand All @@ -745,7 +750,7 @@
" openemr:\n",
" restart: always\n",
" image: openemr/openemr",
":6.0.0",
":6.1.0",
"\n",
" ports:\n",
" - 80:80\n",
Expand Down

0 comments on commit 248a7d1

Please sign in to comment.