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 mysql settings for docker tests

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

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

@ -15,6 +15,11 @@ services:
- "8080:80"
environment:
- MTT_ENABLE_DEBUG=YES
- MTT_DB_TYPE=mysqli
- MTT_DB_HOST=db
- MTT_DB=mytinytodo
- MTT_DB_USER=mtt
- MTT_DB_PASSWORD=mtt
volumes:
- ../../../src:/var/www/html
depends_on:

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

@ -15,6 +15,11 @@ services:
- "8080:80"
environment:
- MTT_ENABLE_DEBUG=YES
- MTT_DB_TYPE=mysqli
- MTT_DB_HOST=db
- MTT_DB=mytinytodo
- MTT_DB_USER=mtt
- MTT_DB_PASSWORD=mtt
volumes:
- ../../../src:/var/www/html
depends_on:

18
src/db/docker-config.php Normal file
View file

@ -0,0 +1,18 @@
<?php
// Rename it to config.php before using in docker.
// On install it will be overwritten.
$config = array();
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;
}
?>

10
src/setup.php
View file

@ -61,9 +61,15 @@ $ver = $db ? get_ver($db, $dbtype) : '';
if (!$ver)
{
# Which DB to select
if(!isset($_POST['installdb']) && !isset($_POST['install']))
if (!isset($_POST['installdb']) && !isset($_POST['install']) && $db !== null)
{
# We already have settings file and need to create tables.
exitMessage("<form method=post>Click next to create tables in '". htmlspecialchars($dbtype). "' database.<br><br>
<input type=hidden name=install value=db><input type=submit value=' Next '></form>");
}
else if (!isset($_POST['installdb']) && !isset($_POST['install']))
{
# Select database 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>