FINERACT-982 - Completely ditch use of Drizzle JDBC Driver after all

This commit is contained in:
Victor Romero
2021-12-24 12:23:56 +08:00
committed by Petri Tuomola
parent 7b4fcb9549
commit 03a8a9858d
16 changed files with 100 additions and 109 deletions
+6 -11
View File
@@ -22,8 +22,9 @@ version: '3.7'
services:
# Backend service
fineractmysql:
image: mysql:5.7
image: mariadb:10.6
volumes:
- ./fineract-db/server_collation.cnf:/etc/mysql/conf.d/server_collation.cnf
- ./fineract-db/docker:/docker-entrypoint-initdb.d:Z,ro
restart: always
environment:
@@ -48,12 +49,12 @@ services:
fineractmysql:
condition: service_healthy
environment:
- DRIVERCLASS_NAME=org.drizzle.jdbc.DrizzleDriver
- DRIVERCLASS_NAME=org.mariadb.jdbc.Driver
- PROTOCOL=jdbc
- node_id=1
- SUB_PROTOCOL=mysql:thin
- fineract_tenants_driver=org.drizzle.jdbc.DrizzleDriver
- fineract_tenants_url=jdbc:mysql:thin://fineractmysql:3306/fineract_tenants
- SUB_PROTOCOL=mariadb
- fineract_tenants_driver=org.mariadb.jdbc.Driver
- fineract_tenants_url=jdbc:mariadb://fineractmysql:3306/fineract_tenants
- fineract_tenants_uid=root
- fineract_tenants_pwd=skdcnwauicn2ucnaecasdsajdnizucawencascdca
- FINERACT_DEFAULT_TENANTDB_HOSTNAME=fineractmysql
@@ -72,9 +73,3 @@ services:
depends_on:
fineract-server:
condition: service_healthy
# https://issues.apache.org/jira/browse/FINERACT-762
# To use an altnerative JDBC driver (which is faster, but not allowed to be default in Apache distribution)
# replace org.drizzle.jdbc.DrizzleDriver with com.mysql.jdbc.Driver in DRIVERCLASS_NAME and fineract_tenants_driver,
# and remove ":thin:" from SUB_PROTOCOL and fineract_tenants_url. Note that the mysql-connector-java-*.jar is already
# bundled in the container by the Dockerfile, but just not used by default.