Port in MariaDB/MySQL Database Configuration

Ported from swiftotter#13
wardenenv · Jan 13, 2023 · dd5ffdd · dd5ffdd
1 parent 229f9c9
commit dd5ffdd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/commands/env-init.cmd b/commands/env-init.cmd
@@ -51,7 +51,8 @@ if [[ "${WARDEN_ENV_TYPE}" == "magento1" ]]; then
 		WARDEN_DB=1
 		WARDEN_REDIS=1
 
-		MARIADB_VERSION=10.3
+		MYSQL_DISTRIBUTION=mariadb
+		MYSQL_DISTRIBUTION_VERSION=10.3
 		NODE_VERSION=12
 		COMPOSER_VERSION=2
 		PHP_VERSION=7.2
@@ -79,7 +80,8 @@ if [[ "${WARDEN_ENV_TYPE}" == "magento2" ]]; then
 		WARDEN_REDIS=1
 
 		ELASTICSEARCH_VERSION=7.6
-		MARIADB_VERSION=10.3
+		MYSQL_DISTRIBUTION=mariadb
+		MYSQL_DISTRIBUTION_VERSION=10.3
 		NODE_VERSION=12
 		COMPOSER_VERSION=2
 		PHP_VERSION=8.1
@@ -109,7 +111,8 @@ fi
 if [[ "${WARDEN_ENV_TYPE}" == "laravel" ]]; then
   cat >> "${WARDEN_ENV_PATH}/.env" <<-EOT
 
-		MARIADB_VERSION=10.4
+		MYSQL_DISTRIBUTION=mariadb
+		MYSQL_DISTRIBUTION_VERSION=10.4
 		NODE_VERSION=12
 		COMPOSER_VERSION=2
 		PHP_VERSION=8.1
@@ -152,7 +155,8 @@ if [[ "${WARDEN_ENV_TYPE}" =~ ^symfony|shopware$ ]]; then
 		WARDEN_ELASTICSEARCH=0
 		WARDEN_VARNISH=0
 
-		MARIADB_VERSION=10.4
+		MYSQL_DISTRIBUTION=mariadb
+		MYSQL_DISTRIBUTION_VERSION=10.4
 		NODE_VERSION=12
 		COMPOSER_VERSION=2
 		PHP_VERSION=8.0
@@ -166,7 +170,8 @@ fi
 if [[ "${WARDEN_ENV_TYPE}" == "wordpress" ]]; then
   cat >> "${WARDEN_ENV_PATH}/.env" <<-EOT
 
-		MARIADB_VERSION=10.4
+		MYSQL_DISTRIBUTION=mariadb
+		MYSQL_DISTRIBUTION_VERSION=10.4
 		NODE_VERSION=12
 		COMPOSER_VERSION=2
 		PHP_VERSION=8.0

diff --git a/environments/includes/db.base.yml b/environments/includes/db.base.yml
@@ -6,7 +6,7 @@ services:
 
   db:
     hostname: "${WARDEN_ENV_NAME}-mariadb"
-    image: ${WARDEN_IMAGE_REPOSITORY}/mariadb:${MARIADB_VERSION:-10.4}
+    image: ${WARDEN_IMAGE_REPOSITORY}/${MYSQL_DISTRIBUTION:-mariadb}:${MYSQL_DISTRIBUTION_VERSION:=${MARIADB_VERSION:-10.4}}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-app}
       - MYSQL_DATABASE=${MYSQL_DATABASE:-app}

diff --git a/environments/magento2/magento2.splitdb.checkout.base.yml b/environments/magento2/magento2.splitdb.checkout.base.yml
@@ -10,7 +10,7 @@ services:
 
   checkoutdb:
     hostname: "${WARDEN_ENV_NAME}-checkoutdb"
-    image: ${WARDEN_IMAGE_REPOSITORY}/mariadb:${MARIADB_VERSION:-10.4}
+    image: ${WARDEN_IMAGE_REPOSITORY}/${MYSQL_DISTRIBUTION:-mariadb}:${MYSQL_DISTRIBUTION_VERSION:=${MARIADB_VERSION:-10.4}}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-magento}
       - MYSQL_DATABASE=${MYSQL_DATABASE:-magento}

diff --git a/environments/magento2/magento2.splitdb.sales.base.yml b/environments/magento2/magento2.splitdb.sales.base.yml
@@ -10,7 +10,7 @@ services:
 
   salesdb:
     hostname: "${WARDEN_ENV_NAME}-salesdb"
-    image: ${WARDEN_IMAGE_REPOSITORY}/mariadb:${MARIADB_VERSION:-10.4}
+    image: ${WARDEN_IMAGE_REPOSITORY}/${MYSQL_DISTRIBUTION:-mariadb}:${MYSQL_DISTRIBUTION_VERSION:=${MARIADB_VERSION:-10.4}}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-magento}
       - MYSQL_DATABASE=${MYSQL_DATABASE:-magento}