Default installer to PostgreSQL

This commit is contained in:
Chirag Aggarwal committed 2026-07-13 11:31:18 +05:30
1 parent 590ccf07ea
commit 2a886e8b49
12 files changed
+44 -30

No files matched your search

+5 -5
View File
@@ -386,25 +386,25 @@ return [
'name' => '_APP_DB_ADAPTER',
'description' => 'Which database to use. Must be one of: MariaDB, MongoDB, or PostgreSQL',
'introduction' => '1.9.0',
'default' => 'mongodb',
'default' => 'postgresql',
'required' => true,
'question' => 'Choose your database (mariadb|mongodb|postgresql)',
'filter' => ''
],
[
'name' => '_APP_DB_HOST',
'description' => 'Database server host name address. Default value is: \'mongodb\'.',
'description' => 'Database server host name address. Default value is: \'postgresql\'.',
'introduction' => '',
'default' => 'mongodb',
'default' => 'postgresql',
'required' => false,
'question' => '',
'filter' => ''
],
[
'name' => '_APP_DB_PORT',
'description' => 'Database server TCP port. Default value is: \'27017\'.',
'description' => 'Database server TCP port. Default value is: \'5432\'.',
'introduction' => '',
'default' => '27017',
'default' => '5432',
'required' => false,
'question' => '',
'filter' => ''
+5 -3
View File
@@ -7,9 +7,9 @@ $defaultHttpsPort ??= '443';
$defaultAppDomain = $vars['_APP_DOMAIN']['default'] ?? 'localhost';
$defaultAppDomain = ($defaultAppDomain === 'traefik') ? 'localhost' : $defaultAppDomain;
$defaultEmailCertificates ??= '';
$defaultDatabase = $vars['_APP_DB_ADAPTER']['default'] ?? 'mongodb';
$defaultDatabase = $vars['_APP_DB_ADAPTER']['default'] ?? 'postgresql';
$lockedDatabase = $isUpgrade && empty($lockedDatabase) ? $defaultDatabase : $lockedDatabase;
$enabledDatabases ??= ['mongodb', 'mariadb'];
$enabledDatabases ??= ['mongodb', 'mariadb', 'postgresql'];
$isLocalInstall ??= false;
@@ -122,7 +122,9 @@ $installerVersion = @filemtime(__DIR__ . '/installer/js/installer.js') ?: time()
</div>
<div class="install-screen" aria-live="polite">
<div class="install-screen-content">
<?php if ($step === 5) { include __DIR__ . '/installer/templates/steps/step-5.phtml'; } ?>
<?php if ($step === 5) {
include __DIR__ . '/installer/templates/steps/step-5.phtml';
} ?>
</div>
</div>
</main>
@@ -4,8 +4,8 @@
const getLockedDatabase = () => getBodyDataset().lockedDatabase || '';
const getEnabledDatabases = () => {
const raw = getBodyDataset().enabledDatabases;
if (!raw) return ['mongodb', 'mariadb'];
try { return JSON.parse(raw); } catch (e) { return ['mongodb', 'mariadb']; }
if (!raw) return ['mongodb', 'mariadb', 'postgresql'];
try { return JSON.parse(raw); } catch (e) { return ['mongodb', 'mariadb', 'postgresql']; }
};
const STEP_IDS = Object.freeze({
@@ -367,7 +367,7 @@
installId,
httpPort: normalizedHttpPort,
httpsPort: normalizedHttpsPort,
database: formState?.database || 'mongodb',
database: formState?.database || 'postgresql',
appDomain: normalizedDomain,
emailCertificates: normalizedEmail,
opensslKey: (formState?.opensslKey || '').trim(),
@@ -6,8 +6,8 @@ $defaultHttpPort ??= '80';
$defaultHttpsPort ??= '443';
$defaultEmailCertificates ??= '';
$defaultAssistantOpenAIKey ??= '';
$defaultDatabase ??= 'mongodb';
$enabledDatabases ??= ['mongodb', 'mariadb'];
$defaultDatabase ??= 'postgresql';
$enabledDatabases ??= ['mongodb', 'mariadb', 'postgresql'];
$selectedDatabase = $lockedDatabase ?: $defaultDatabase;
$isDatabaseLocked = !empty($lockedDatabase);
$mongoEnabled = in_array('mongodb', $enabledDatabases, true);
@@ -6,7 +6,7 @@ $defaultHttpPort = $defaultHttpPort ?? '80';
$defaultHttpsPort = $defaultHttpsPort ?? '443';
$defaultEmailCertificates = $defaultEmailCertificates ?? '';
$defaultSecretKey = $defaultSecretKey ?? '';
$defaultDatabase = $defaultDatabase ?? 'mongodb';
$defaultDatabase = $defaultDatabase ?? 'postgresql';
$selectedDatabase = $lockedDatabase ?: $defaultDatabase;
$defaultDatabaseLabel = match ($selectedDatabase) {
'mariadb' => 'MariaDB',
+2 -2
View File
@@ -8,7 +8,7 @@ class Generator
{
private const array SELECTABLE_SERVICE_GROUPS = [
'database' => [
'default' => 'mongodb',
'default' => 'postgresql',
'services' => [
'mariadb',
'mongodb',
@@ -43,7 +43,7 @@ class Generator
private const array PARAM_DEFAULTS = [
'version' => 'latest',
'database' => 'mongodb',
'database' => 'postgresql',
'hostPath' => '',
'enableAssistant' => false,
];
@@ -225,7 +225,7 @@ class Install extends Action
'_APP_DOMAIN' => $appDomain ?: 'localhost',
'_APP_DOMAIN_TARGET' => $appDomain ?: 'localhost',
'_APP_EMAIL_CERTIFICATES' => $emailCertificates,
'_APP_DB_ADAPTER' => $lockedDatabase ?? ($database ?: 'mongodb'),
'_APP_DB_ADAPTER' => $lockedDatabase ?? ($database ?: 'postgresql'),
'_APP_ASSISTANT_OPENAI_API_KEY' => $assistantOpenAIKey,
];
@@ -294,7 +294,7 @@ class Install extends Action
'payload' => [
'httpPort' => $httpPort ?: $config->getDefaultHttpPort(),
'httpsPort' => $httpsPort ?: $config->getDefaultHttpsPort(),
'database' => $lockedDatabase ?? ($database ?: 'mongodb'),
'database' => $lockedDatabase ?? ($database ?: 'postgresql'),
'appDomain' => $appDomain ?: 'localhost',
'emailCertificates' => $emailCertificates,
'opensslKeyHash' => $state->hashSensitiveValue($opensslKey),
@@ -27,7 +27,7 @@ final class Config
private bool $isLocal = false;
private ?string $hostPath = null;
private ?string $lockedDatabase = null;
private array $enabledDatabases = ['mongodb', 'mariadb'];
private array $enabledDatabases = ['mongodb', 'mariadb', 'postgresql'];
private array $vars = [];
public function __construct(array $values = [])
+6 -6
View File
@@ -59,7 +59,7 @@ class Install extends Action
->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true)
->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
->param('no-start', false, new Boolean(true), 'Run an interactive session', true)
->param('database', 'mongodb', new WhiteList(['mongodb', 'mariadb']), 'Database to use (mongodb|mariadb)', true)
->param('database', 'postgresql', new WhiteList(['mongodb', 'mariadb', 'postgresql']), 'Database to use (mongodb|mariadb|postgresql)', true)
->callback($this->action(...));
}
@@ -202,7 +202,7 @@ class Install extends Action
}
$installerConfig = $this->readInstallerConfig();
$enabledDatabases = $installerConfig['enabledDatabases'] ?? ['mongodb', 'mariadb'];
$enabledDatabases = $installerConfig['enabledDatabases'] ?? ['mongodb', 'mariadb', 'postgresql'];
$isExistingDatabase = $isUpgrade && $existingDatabase !== null && $database === $existingDatabase;
if (!in_array($database, $enabledDatabases, true) && !$isExistingDatabase) {
Console::error("Database '{$database}' is not available. Available options: " . implode(', ', $enabledDatabases));
@@ -335,7 +335,7 @@ class Install extends Action
$state->clearStaleLock();
$installerConfig = $this->readInstallerConfig();
$enabledDatabases = $installerConfig['enabledDatabases'] ?? ['mongodb', 'mariadb'];
$enabledDatabases = $installerConfig['enabledDatabases'] ?? ['mongodb', 'mariadb', 'postgresql'];
if ($isUpgrade && $lockedDatabase !== null && !in_array($lockedDatabase, $enabledDatabases, true)) {
$enabledDatabases[] = $lockedDatabase;
}
@@ -436,7 +436,7 @@ class Install extends Action
}
// Set database-specific connection details
$database = $input['_APP_DB_ADAPTER'] ?? 'mongodb';
$database = $input['_APP_DB_ADAPTER'] ?? 'postgresql';
if ($database === 'mongodb') {
$input['_APP_DB_HOST'] = 'mongodb';
$input['_APP_DB_PORT'] = 27017;
@@ -541,7 +541,7 @@ class Install extends Action
}
$composeGenerator = new Generator($composeYaml);
$database = $input['_APP_DB_ADAPTER'] ?? 'mongodb';
$database = $input['_APP_DB_ADAPTER'] ?? 'postgresql';
$version = \getenv('_APP_VERSION') ?: (\defined('APP_VERSION_STABLE') ? APP_VERSION_STABLE : 'latest');
if ($isLocalInstall) {
@@ -874,7 +874,7 @@ class Install extends Action
}
$type = $isUpgrade ? 'upgrade' : 'install';
$database = $input['_APP_DB_ADAPTER'] ?? 'mongodb';
$database = $input['_APP_DB_ADAPTER'] ?? 'postgresql';
$name = $account['name'] ?? 'Admin';
$email = $account['email'] ?? 'admin@selfhosted.local';
@@ -35,6 +35,18 @@ final class GeneratorTest extends TestCase
$this->assertArrayNotHasKey('appwrite-postgresql', $compose['volumes']);
}
public function testDefaultsToPostgreSQL(): void
{
$compose = $this->render();
$this->assertArrayHasKey('postgresql', $compose['services']);
$this->assertArrayNotHasKey('mongodb', $compose['services']);
$this->assertArrayNotHasKey('mariadb', $compose['services']);
$this->assertArrayHasKey('appwrite-postgresql', $compose['volumes']);
$this->assertArrayNotHasKey('appwrite-mongodb', $compose['volumes']);
$this->assertArrayNotHasKey('appwrite-mariadb', $compose['volumes']);
}
public function testTogglesAssistantService(): void
{
$disabled = $this->render([
@@ -22,7 +22,7 @@ final class ConfigTest extends TestCase
$this->assertFalse($config->isLocal());
$this->assertNull($config->getHostPath());
$this->assertNull($config->getLockedDatabase());
$this->assertSame(['mongodb', 'mariadb'], $config->getEnabledDatabases());
$this->assertSame(['mongodb', 'mariadb', 'postgresql'], $config->getEnabledDatabases());
$this->assertEmpty($config->getVars());
}
@@ -439,7 +439,7 @@ final class ConfigTest extends TestCase
$this->assertFalse($array['isLocal']);
$this->assertNull($array['hostPath']);
$this->assertNull($array['lockedDatabase']);
$this->assertEquals(['mongodb', 'mariadb'], $array['enabledDatabases']);
$this->assertEquals(['mongodb', 'mariadb', 'postgresql'], $array['enabledDatabases']);
}
public function testMultipleApplyCallsAccumulate(): void
@@ -494,10 +494,10 @@ final class ConfigTest extends TestCase
public function testDefaultEnabledDatabases(): void
{
$config = new Config();
$this->assertSame(['mongodb', 'mariadb'], $config->getEnabledDatabases());
$this->assertSame(['mongodb', 'mariadb', 'postgresql'], $config->getEnabledDatabases());
$this->assertTrue($config->isDatabaseEnabled('mongodb'));
$this->assertTrue($config->isDatabaseEnabled('mariadb'));
$this->assertFalse($config->isDatabaseEnabled('postgresql'));
$this->assertTrue($config->isDatabaseEnabled('postgresql'));
}
public function testSetEnabledDatabases(): void
@@ -535,7 +535,7 @@ final class ConfigTest extends TestCase
{
$config = new Config();
$config->apply(['enabledDatabases' => 'mongodb']);
$this->assertSame(['mongodb', 'mariadb'], $config->getEnabledDatabases());
$this->assertSame(['mongodb', 'mariadb', 'postgresql'], $config->getEnabledDatabases());
}
public function testEnabledDatabasesInToArray(): void