From a0575a3d9278fbee5db9cee97473ecf781c4a40d Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Wed, 15 Jul 2026 10:40:53 +0530 Subject: [PATCH] (chore): make postgresql the default database adapter --- .env | 6 ++-- .github/workflows/ci.yml | 2 +- app/init/registers.php | 8 +++--- docker-compose.yml | 32 ++++++++++----------- src/Appwrite/Docker/Compose/Generator.php | 1 + tests/unit/Docker/Compose/GeneratorTest.php | 2 +- 6 files changed, 26 insertions(+), 25 deletions(-) diff --git a/.env b/.env index e3809d4476..6f7f62a12f 100644 --- a/.env +++ b/.env @@ -36,9 +36,9 @@ _APP_CONSOLE_COUNTRIES_DENYLIST=AQ _APP_CONSOLE_WHITELIST_EMAILS= _APP_CONSOLE_WHITELIST_IPS= _APP_CONSOLE_WHITELIST_ROOT=disabled -_APP_DB_ADAPTER=mongodb -_APP_DB_HOST=mongodb -_APP_DB_PORT=27017 +_APP_DB_ADAPTER=postgresql +_APP_DB_HOST=postgresql +_APP_DB_PORT=5432 _APP_DB_SCHEMA=appwrite _APP_DB_USER=user _APP_DB_PASS=password diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 793b4b2144..2021359541 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -252,7 +252,7 @@ jobs: return; } - core.setOutput('databases', JSON.stringify(['MongoDB'])); + core.setOutput('databases', JSON.stringify(['PostgreSQL'])); core.setOutput('modes', JSON.stringify(['dedicated'])); build: diff --git a/app/init/registers.php b/app/init/registers.php index d188a0b614..633a9b0d12 100644 --- a/app/init/registers.php +++ b/app/init/registers.php @@ -151,9 +151,9 @@ $register->set('pools', function () { $group = new Group(); $fallbackForDB = 'db_main=' . AppwriteURL::unparse([ - 'scheme' => System::getEnv('_APP_DB_ADAPTER', 'mongodb'), - 'host' => System::getEnv('_APP_DB_HOST', 'mongodb'), - 'port' => System::getEnv('_APP_DB_PORT', '27017'), + 'scheme' => System::getEnv('_APP_DB_ADAPTER', 'postgresql'), + 'host' => System::getEnv('_APP_DB_HOST', 'postgresql'), + 'port' => System::getEnv('_APP_DB_PORT', '5432'), 'user' => System::getEnv('_APP_DB_USER', ''), 'pass' => System::getEnv('_APP_DB_PASS', ''), 'path' => System::getEnv('_APP_DB_SCHEMA', ''), @@ -408,7 +408,7 @@ $register->set('db', function () { $dbUser = System::getEnv('_APP_DB_USER', ''); $dbPass = System::getEnv('_APP_DB_PASS', ''); $dbSchema = System::getEnv('_APP_DB_SCHEMA', ''); - $dbAdapter = System::getEnv('_APP_DB_ADAPTER', 'mongodb'); + $dbAdapter = System::getEnv('_APP_DB_ADAPTER', 'postgresql'); $dsn = ''; switch ($dbAdapter) { diff --git a/docker-compose.yml b/docker-compose.yml index 1e83919049..6cb71e9398 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -74,7 +74,7 @@ services: - appwrite-builds:/storage/builds:rw depends_on: - redis - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - appwrite-embedding - appwrite-geo environment: @@ -261,7 +261,7 @@ services: networks: - appwrite depends_on: - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - redis - appwrite-embedding environment: @@ -305,7 +305,7 @@ services: - appwrite depends_on: - redis - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - appwrite-embedding environment: - _APP_ENV @@ -341,7 +341,7 @@ services: - appwrite depends_on: - redis - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - appwrite-embedding volumes: - appwrite-uploads:/storage/uploads:rw @@ -409,7 +409,7 @@ services: - appwrite depends_on: - redis - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - appwrite-embedding environment: - _APP_ENV @@ -454,7 +454,7 @@ services: - appwrite-builds:/storage/builds:rw depends_on: - redis - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - appwrite-embedding environment: - _APP_ENV @@ -538,7 +538,7 @@ services: - appwrite-builds:/storage/builds:rw depends_on: - redis - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} environment: - _APP_ENV - _APP_WORKERS_NUM=1 @@ -578,7 +578,7 @@ services: - appwrite-uploads:/storage/uploads:rw depends_on: - redis - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} environment: - _APP_BROWSER_HOST - _APP_WORKER_SCREENSHOTS_ROUTER @@ -638,7 +638,7 @@ services: - appwrite depends_on: - redis - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - appwrite-embedding volumes: - appwrite-config:/storage/config:rw @@ -684,7 +684,7 @@ services: networks: - appwrite depends_on: - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - redis environment: - _APP_ENV @@ -879,7 +879,7 @@ services: - appwrite-imports:/storage/imports:rw - appwrite-uploads:/storage/uploads:rw depends_on: - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} environment: - _APP_ENV - _APP_WORKERS_NUM=1 @@ -923,7 +923,7 @@ services: networks: - appwrite depends_on: - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - redis environment: - _APP_ENV @@ -970,7 +970,7 @@ services: networks: - appwrite depends_on: - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - redis environment: - _APP_ENV @@ -1012,7 +1012,7 @@ services: networks: - appwrite depends_on: - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - redis - appwrite-embedding environment: @@ -1051,7 +1051,7 @@ services: networks: - appwrite depends_on: - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - redis - appwrite-embedding environment: @@ -1090,7 +1090,7 @@ services: networks: - appwrite depends_on: - - ${_APP_DB_HOST:-mongodb} + - ${_APP_DB_HOST:-postgresql} - redis - appwrite-embedding environment: diff --git a/src/Appwrite/Docker/Compose/Generator.php b/src/Appwrite/Docker/Compose/Generator.php index 50f227af9f..2baed3f2f6 100644 --- a/src/Appwrite/Docker/Compose/Generator.php +++ b/src/Appwrite/Docker/Compose/Generator.php @@ -55,6 +55,7 @@ class Generator 'condition' => 'service_healthy', ], 'placeholders' => [ + '${_APP_DB_HOST:-postgresql}', '${_APP_DB_HOST:-mongodb}', '${_APP_DB_HOST:-mariadb}', ], diff --git a/tests/unit/Docker/Compose/GeneratorTest.php b/tests/unit/Docker/Compose/GeneratorTest.php index 76b2a13378..29187a4939 100644 --- a/tests/unit/Docker/Compose/GeneratorTest.php +++ b/tests/unit/Docker/Compose/GeneratorTest.php @@ -111,7 +111,7 @@ final class GeneratorTest extends TestCase $this->assertSame(['appwrite'], $compose['services']['traefik']['depends_on']); $this->assertArrayHasKey('postgresql', $compose['services']['appwrite']['depends_on']); - $this->assertArrayNotHasKey('${_APP_DB_HOST:-mongodb}', $compose['services']['appwrite']['depends_on']); + $this->assertArrayNotHasKey('${_APP_DB_HOST:-postgresql}', $compose['services']['appwrite']['depends_on']); } public function testKeepsLongCommandsReadable(): void