joomla/docker
32
3
Fork 0
mirror of https://github.com/joomla-docker/docker-joomla.git synced 2024-06-02 14:20:47 +00:00
Code Issues Releases Activity

Adds pgsql compatibility #42

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2023-03-31 15:08:53 +02:00
parent f03a7cf528
commit 84876534d1
Signed by: Llewellyn
GPG Key ID: A9201372263741E7
2 changed files with 78 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-entrypoint.sh
View File

@ -120,7 +120,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
fi fi
# Ensure the MySQL Database is created # Ensure the MySQL Database is created
php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}"
echo >&2 "========================================================================" echo >&2 "========================================================================"
echo >&2 echo >&2

81
makedb.php
View File

@ -1,5 +1,5 @@
<?php <?php
// Args: 0 => makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME" // Args: 0 => makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME", 5 => "$JOOMLA_DB_TYPE"
$stderr = fopen('php://stderr', 'w'); $stderr = fopen('php://stderr', 'w');
fwrite($stderr, "\nEnsuring Joomla database is present\n"); fwrite($stderr, "\nEnsuring Joomla database is present\n");
@ -10,17 +10,24 @@ if (strpos($argv[1], ':') !== false)
else else
{ {
$host = $argv[1]; $host = $argv[1];
$port = 3306; $port = null;
} }
$maxTries = 10; $user = $argv[2];
$password = $argv[3];
$db = $argv[4];
$dbType = strtolower($argv[5]);
// set original default behaviour for PHP 8.1 and higher if ($dbType === 'mysqli')
// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
mysqli_report(MYSQLI_REPORT_OFF);
do
{ {
$mysql = new mysqli($host, $argv[2], $argv[3], '', (int) $port); $port = $port ? (int)$port : 3306;
$maxTries = 10;
// set original default behaviour for PHP 8.1 and higher
// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
mysqli_report(MYSQLI_REPORT_OFF);
do {
$mysql = new mysqli($host, $user, $password, '', $port);
if ($mysql->connect_error) if ($mysql->connect_error)
{ {
@ -34,16 +41,62 @@ do
sleep(3); sleep(3);
} }
} } while ($mysql->connect_error);
while ($mysql->connect_error);
if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($argv[4]) . '`')) if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($db) . '`'))
{ {
fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n");
$mysql->close(); $mysql->close();
exit(1); exit(1);
}
fwrite($stderr, "\nMySQL Database Created\n");
$mysql->close();
} }
elseif ($dbType === 'pgsql')
{
$port = $port ? (int)$port : 5432;
$maxTries = 10;
fwrite($stderr, "\nMySQL Database Created\n"); do {
$connection = "host={$host} port={$port} user={$user} password={$password}";
$dbconn = @pg_connect($connection);
$mysql->close(); if (!$dbconn)
{
fwrite($stderr, "\nPostgreSQL Connection Error\n");
--$maxTries;
if ($maxTries <= 0)
{
exit(1);
}
sleep(3);
}
} while (!$dbconn);
$query = "SELECT 1 FROM pg_database WHERE datname = '$db'";
$result = pg_query($dbconn, $query);
if (pg_num_rows($result) == 0)
{
$createDbQuery = "CREATE DATABASE \"$db\"";
if (!pg_query($dbconn, $createDbQuery))
{
fwrite($stderr, "\nPostgreSQL 'CREATE DATABASE' Error\n");
pg_close($dbconn);
exit(1);
}
}
fwrite($stderr, "\nPostgreSQL Database Created\n");
pg_close($dbconn);
}
else
{
fwrite($stderr, "\nInvalid database type. Please provide 'pgsql' or 'mysqli'.\n");
exit(1);
}