diff --git a/app/config/variables.php b/app/config/variables.php index 6c3fb4ae16..ab7e8bf320 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -287,6 +287,24 @@ return [ 'required' => false, 'question' => '', 'filter' => 'password' + ], + [ + 'name' => '_APP_DB_PROJECT', + 'description' => 'A list of comma-separated key value pairs representing Project DBs where key is the database name and value is the DSN connection string.', + 'introduction' => 'TBD', + 'default' => 'db_fra1_01=mysql://user:password@mariadb:3306/appwrite', + 'required' => true, + 'question' => '', + 'filter' => '' + ], + [ + 'name' => '_APP_DB__APP_DB_CONSOLEROOT_PASS', + 'description' => 'A key value pair representing the Console DB where key is the database name and value is the DSN connection string.', + 'introduction' => 'TBD', + 'default' => 'db_fra1_01=mysql://user:password@mariadb:3306/appwrite', + 'required' => true, + 'question' => '', + 'filter' => '' ] ], ], diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 45628f5bcc..46800927c2 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -92,11 +92,8 @@ services: - _APP_REDIS_PORT - _APP_REDIS_USER - _APP_REDIS_PASS - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS + - _APP_DB_CONSOLE + - _APP_DB_PROJECT - _APP_SMTP_HOST - _APP_SMTP_PORT - _APP_SMTP_SECURE @@ -185,11 +182,8 @@ services: - _APP_OPENSSL_KEY_V1 - _APP_REDIS_HOST - _APP_REDIS_PORT - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS + - _APP_DB_CONSOLE + - _APP_DB_PROJECT - _APP_USAGE_STATS - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG @@ -212,11 +206,8 @@ services: - _APP_REDIS_PORT - _APP_REDIS_USER - _APP_REDIS_PASS - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS + - _APP_DB_CONSOLE + - _APP_DB_PROJECT - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG @@ -266,11 +257,8 @@ services: - _APP_REDIS_PORT - _APP_REDIS_USER - _APP_REDIS_PASS - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS + - _APP_DB_CONSOLE + - _APP_DB_PROJECT - _APP_STORAGE_DEVICE - _APP_STORAGE_S3_ACCESS_KEY - _APP_STORAGE_S3_SECRET @@ -315,11 +303,8 @@ services: - _APP_REDIS_PORT - _APP_REDIS_USER - _APP_REDIS_PASS - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS + - _APP_DB_CONSOLE + - _APP_DB_PROJECT - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG @@ -343,11 +328,8 @@ services: - _APP_REDIS_PORT - _APP_REDIS_USER - _APP_REDIS_PASS - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS + - _APP_DB_CONSOLE + - _APP_DB_PROJECT - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG @@ -375,11 +357,8 @@ services: - _APP_REDIS_PORT - _APP_REDIS_USER - _APP_REDIS_PASS - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS + - _APP_DB_CONSOLE + - _APP_DB_PROJECT - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG @@ -402,11 +381,8 @@ services: - _APP_REDIS_PORT - _APP_REDIS_USER - _APP_REDIS_PASS - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS + - _APP_DB_CONSOLE + - _APP_DB_PROJECT - _APP_FUNCTIONS_TIMEOUT - _APP_EXECUTOR_SECRET - _APP_EXECUTOR_HOST @@ -538,11 +514,8 @@ services: - _APP_REDIS_PORT - _APP_REDIS_USER - _APP_REDIS_PASS - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS + - _APP_DB_CONSOLE + - _APP_DB_PROJECT - _APP_MAINTENANCE_INTERVAL - _APP_MAINTENANCE_RETENTION_EXECUTION - _APP_MAINTENANCE_RETENTION_ABUSE @@ -562,11 +535,8 @@ services: environment: - _APP_ENV - _APP_OPENSSL_KEY_V1 - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS + - _APP_DB_CONSOLE + - _APP_DB_PROJECT - _APP_INFLUXDB_HOST - _APP_INFLUXDB_PORT - _APP_USAGE_AGGREGATION_INTERVAL diff --git a/docker-compose.yml b/docker-compose.yml index 91f276f89a..5afdddec5d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -318,7 +318,7 @@ services: volumes: - ./app:/usr/src/code/app - ./src:/usr/src/code/src - - ./vendor/utopia-php/database:/usr/src/code/vendor/utopia-php/database + # - ./vendor/utopia-php/database:/usr/src/code/vendor/utopia-php/database depends_on: - redis - mariadb