Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions aws/rds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Parameters:
dbEngineMajorVer:
Description: "The mysql major version. WARNING: only change during planned major version upgrades"
Type: String
Default: "8.0"
Default: "8.4"
charSet:
Description: "What character set to use? Default to utf8"
Type: String
Expand Down Expand Up @@ -139,12 +139,6 @@ Resources:
dbParamGroup:
Type: "AWS::RDS::DBParameterGroup"
Properties:
DBParameterGroupName:
Fn::Sub:
- "mysql${ver}-${app}-${env}"
- ver: !Select [0, !Split [".", !Ref dbEngineMajorVer]]
app: !Ref appName
env: !Ref envType
Description: !Sub "DB Parameter group for ${appName}-${envType}"
Family: !Sub "mysql${dbEngineMajorVer}"
Parameters:
Expand Down Expand Up @@ -244,7 +238,7 @@ Resources:
MultiAZ: false
#NetworkType: IPV4
EngineVersion: !Ref dbEngineMajorVer
AllowMajorVersionUpgrade: false
AllowMajorVersionUpgrade: true
AutoMinorVersionUpgrade: true
LicenseModel: "general-public-license"
PubliclyAccessible: false
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:
mysql:
# need to support arm64 so need Oracle
image: mysql:8.0.34-oracle
image: mysql:8.4.5-oracle
ports:
- 3306:3306
environment:
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.4.0</version>
</dependency>
<dependency>
<groupId>uk.ac.ox.ctl</groupId>
Expand Down