diff --git a/docker/dev/mtt-php70-apache/compose.yml b/docker/dev/mtt-php70-apache/compose.yml index 77ffc46..b5acbab 100644 --- a/docker/dev/mtt-php70-apache/compose.yml +++ b/docker/dev/mtt-php70-apache/compose.yml @@ -7,6 +7,7 @@ services: - "8080:80" environment: - MTT_ENABLE_DEBUG=YES + - MTT_DB_TYPE=sqlite volumes: - ../../../src:/var/www/html - ./php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini diff --git a/docker/dev/mtt-php72-apache/compose.yml b/docker/dev/mtt-php72-apache/compose.yml index 1d85c61..6ebd533 100644 --- a/docker/dev/mtt-php72-apache/compose.yml +++ b/docker/dev/mtt-php72-apache/compose.yml @@ -7,6 +7,7 @@ services: - "8080:80" environment: - MTT_ENABLE_DEBUG=YES + - MTT_DB_TYPE=sqlite volumes: - ../../../src:/var/www/html - ./php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini diff --git a/docker/dev/mtt-php74-apache/compose.yml b/docker/dev/mtt-php74-apache/compose.yml index bb59b91..8cf2f2a 100644 --- a/docker/dev/mtt-php74-apache/compose.yml +++ b/docker/dev/mtt-php74-apache/compose.yml @@ -7,6 +7,7 @@ services: - "8080:80" environment: - MTT_ENABLE_DEBUG=YES + - MTT_DB_TYPE=sqlite volumes: - ../../../src:/var/www/html - ./php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini diff --git a/docker/dev/mtt-php80-apache/compose.yml b/docker/dev/mtt-php80-apache/compose.yml index bf5e07c..d14113a 100644 --- a/docker/dev/mtt-php80-apache/compose.yml +++ b/docker/dev/mtt-php80-apache/compose.yml @@ -11,5 +11,6 @@ services: - "8080:80" environment: - MTT_ENABLE_DEBUG=YES + - MTT_DB_TYPE=sqlite volumes: - ../../../src:/var/www/html diff --git a/docker/dev/mtt-php81-apache/compose.yml b/docker/dev/mtt-php81-apache/compose.yml index 0887620..df4a170 100644 --- a/docker/dev/mtt-php81-apache/compose.yml +++ b/docker/dev/mtt-php81-apache/compose.yml @@ -11,5 +11,6 @@ services: - "8080:80" environment: - MTT_ENABLE_DEBUG=YES + - MTT_DB_TYPE=sqlite volumes: - ../../../src:/var/www/html diff --git a/src/db/docker-config.php b/src/db/docker-config.php index 239c646..a584520 100644 --- a/src/db/docker-config.php +++ b/src/db/docker-config.php @@ -5,7 +5,16 @@ $config = array(); -if (getenv('MTT_DB_TYPE') == 'mysqli') { +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'); @@ -14,5 +23,9 @@ if (getenv('MTT_DB_TYPE') == 'mysqli') { $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/setup.php b/src/setup.php index 505cb61..af2e17d 100644 --- a/src/setup.php +++ b/src/setup.php @@ -69,7 +69,7 @@ if (!$ver) } else if (!isset($_POST['installdb']) && !isset($_POST['install'])) { - # Select database and connection settings to save. + # Specify database type and connection settings to save. exitMessage("
Select database type to use: