prehistoric-systems/mytinytodo
1
0
Fork 0
mirror of https://github.com/maxpozdeev/mytinytodo.git synced 2026-03-11 08:55:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify sqlite settings for docker tests

Browse source
This commit is contained in:
Max Pozdeev 2022-01-13 00:20:47 +03:00
parent 63645a279a
commit dbb697b82a
7 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docker/dev/mtt-php70-apache/compose.yml
View file

@ -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

1
docker/dev/mtt-php72-apache/compose.yml
View file

@ -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

1
docker/dev/mtt-php74-apache/compose.yml
View file

@ -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

1
docker/dev/mtt-php80-apache/compose.yml
View file

@ -11,5 +11,6 @@ services:
- "8080:80"
environment:
- MTT_ENABLE_DEBUG=YES
- MTT_DB_TYPE=sqlite
volumes:
- ../../../src:/var/www/html

1
docker/dev/mtt-php81-apache/compose.yml
View file

@ -11,5 +11,6 @@ services:
- "8080:80"
environment:
- MTT_ENABLE_DEBUG=YES
- MTT_DB_TYPE=sqlite
volumes:
- ../../../src:/var/www/html

15
src/db/docker-config.php
View file

@ -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_';
}
?>

2
src/setup.php
View file

@ -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("<form method=post>Select database type to use:<br><br>
<label><input type=radio name=installdb value=sqlite checked=checked onclick=\"document.getElementById('mysqlsettings').style.display='none'\">SQLite</label><br><br>
<label><input type=radio name=installdb value=mysql onclick=\"document.getElementById('mysqlsettings').style.display=''\">MySQL</label><br>