From a2f8c843cd9b06e51d567dfeaf0477831d88df76 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Mon, 31 Jan 2022 22:04:20 +0300
Subject: [PATCH] update docker files to support new db config

---
 .../mtt-php80-apache-mariadb105/compose.yml   |  4 ++-
 .../mtt-php81-apache-mariadb105/compose.yml   |  4 ++-
 src/db/docker-config.php                      | 31 -------------------
 src/docker-config.php                         | 17 ++++++++++
 4 files changed, 23 insertions(+), 33 deletions(-)
 delete mode 100644 src/db/docker-config.php
 create mode 100644 src/docker-config.php

diff --git a/docker/dev/mtt-php80-apache-mariadb105/compose.yml b/docker/dev/mtt-php80-apache-mariadb105/compose.yml
index fb2f3c5..f928fff 100644
--- a/docker/dev/mtt-php80-apache-mariadb105/compose.yml
+++ b/docker/dev/mtt-php80-apache-mariadb105/compose.yml
@@ -15,11 +15,13 @@ services:
       - "8080:80"
     environment:
       - MTT_ENABLE_DEBUG=YES
-      - MTT_DB_TYPE=mysqli
+      - MTT_DB_TYPE=mysql
       - MTT_DB_HOST=db
       - MTT_DB=mytinytodo
       - MTT_DB_USER=mtt
       - MTT_DB_PASSWORD=mtt
+      - MTT_DB_PREFIX=mtt_
+      - MTT_DB_DRIVER=mysqli
     volumes:
       - ../../../src:/var/www/html
     depends_on:
diff --git a/docker/dev/mtt-php81-apache-mariadb105/compose.yml b/docker/dev/mtt-php81-apache-mariadb105/compose.yml
index 5a43408..8e3b511 100644
--- a/docker/dev/mtt-php81-apache-mariadb105/compose.yml
+++ b/docker/dev/mtt-php81-apache-mariadb105/compose.yml
@@ -15,11 +15,13 @@ services:
       - "8080:80"
     environment:
       - MTT_ENABLE_DEBUG=YES
-      - MTT_DB_TYPE=mysqli
+      - MTT_DB_TYPE=mysql
       - MTT_DB_HOST=db
       - MTT_DB=mytinytodo
       - MTT_DB_USER=mtt
       - MTT_DB_PASSWORD=mtt
+      - MTT_DB_PREFIX=mtt_
+      - MTT_DB_DRIVER=mysqli
     volumes:
       - ../../../src:/var/www/html
     depends_on:
diff --git a/src/db/docker-config.php b/src/db/docker-config.php
deleted file mode 100644
index a584520..0000000
--- a/src/db/docker-config.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-// Rename it to config.php before using in docker.
-// On install it will be overwritten.
-
-$config = array();
-
-if (getenv('MTT_DB_TYPE') == 'mysql') {
-	$config['db'] = 'mysql';
-	$config['mysql.host'] = getenv('MTT_DB_HOST');
-	$config['mysql.db'] = getenv('MTT_DB');
-	$config['mysql.user'] = getenv('MTT_DB_USER');
-	$config['mysql.password'] = getenv('MTT_DB_PASSWORD');
-	$config['prefix'] = 'mtt_';
-	$config['mysqli'] = 0;
-}
-else if (getenv('MTT_DB_TYPE') == 'mysqli') {
-	$config['db'] = 'mysql';
-	$config['mysql.host'] = getenv('MTT_DB_HOST');
-	$config['mysql.db'] = getenv('MTT_DB');
-	$config['mysql.user'] = getenv('MTT_DB_USER');
-	$config['mysql.password'] = getenv('MTT_DB_PASSWORD');
-	$config['prefix'] = 'mtt_';
-	$config['mysqli'] = 1;
-}
-else if (getenv('MTT_DB_TYPE') == 'sqlite') {
-	$config['db'] = 'sqlite';
-	$config['prefix'] = 'mtt_';
-}
-
-?>
\ No newline at end of file
diff --git a/src/docker-config.php b/src/docker-config.php
new file mode 100644
index 0000000..150b9ec
--- /dev/null
+++ b/src/docker-config.php
@@ -0,0 +1,17 @@
+<?php
+
+// Rename it to config.php before using in docker.
+
+if (getenv('MTT_DB_TYPE') == 'mysql') {
+	define("MTT_DB_TYPE", "mysql");
+	define("MTT_DB_HOST", getenv('MTT_DB_HOST'));
+	define("MTT_DB_NAME", getenv('MTT_DB'));
+	define("MTT_DB_USER", getenv('MTT_DB_USER'));
+	define("MTT_DB_PASSWORD", getenv('MTT_DB_PASSWORD'));
+	define("MTT_DB_PREFIX", getenv('MTT_DB_PREFIX'));
+	define("MTT_DB_DRIVER", getenv('MTT_DB_DRIVER'));
+}
+else if (getenv('MTT_DB_TYPE') == 'sqlite') {
+	define("MTT_DB_TYPE", "sqlite");
+	define("MTT_DB_PREFIX", "");
+}