From 8645d32b13b9ce52865ef3b5742d1dee17a86220 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 3 Nov 2021 18:21:15 +0100 Subject: [PATCH] mysql -> mariadb. --- defaults/main.yml | 2 +- templates/inception-project-docker-compose.yml.j2 | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 9aa8194..644b006 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -38,7 +38,7 @@ inception_project_server_preauth_users_roles: [] # DB inception_project_db_as_container: True inception_project_docker_db_node: 'localhost' -inception_project_db_image: 'mysql:5' +inception_project_db_image: 'mariadb:10.5' inception_project_db_host: 'mysql-server' inception_project_db_port: 3306 inception_project_db_name: 'inception' diff --git a/templates/inception-project-docker-compose.yml.j2 b/templates/inception-project-docker-compose.yml.j2 index 21d2634..02d7a71 100644 --- a/templates/inception-project-docker-compose.yml.j2 +++ b/templates/inception-project-docker-compose.yml.j2 @@ -20,12 +20,14 @@ services: - haproxy-public {% endif %} environment: - - INCEPTION_DB_DIALECT=org.hibernate.dialect.MySQL5InnoDBDialect - - INCEPTION_DB_DRIVER=com.mysql.cj.jdbc.Driver - - INCEPTION_DB_URL=jdbc:mysql://{{ inception_project_db_host }}:{{ inception_project_db_port }}/{{ inception_project_db_name }}?useUnicode=true&characterEncoding=UTF-8 + - INCEPTION_DB_DIALECT=org.hibernate.dialect.MariaDB103Dialect + - INCEPTION_DB_DRIVER=org.mariadb.jdbc.Driver + - INCEPTION_DB_URL=jdbc:mariadb://{{ inception_project_db_host }}:{{ inception_project_db_port }}/{{ inception_project_db_name }}?useUnicode=true&characterEncoding=UTF-8 - INCEPTION_DB_USERNAME={{ inception_project_db_user }} - INCEPTION_DB_PASSWORD={{ inception_project_db_pwd }} - VIRTUAL_HOST={{ inception_project_server_endpoint }} + - JAVA_OPTS=-Dspring.jpa.properties.hibernate.dialect.storage_engine=innodb + volumes: volumes: - {{ inception_project_service_volume }}:/export depends_on: