diff --git a/app/config/variables.php b/app/config/variables.php index 011164db25..5a5e0e951b 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -165,7 +165,7 @@ return [ ], [ 'name' => '_APP_DB_USER', - 'description' => 'MariaDB server user name. Default value is: \'root\'.', + 'description' => 'MariaDB server user name. Default value is: \'user\'.', 'introduction' => '', 'default' => 'user', 'required' => false, @@ -341,7 +341,7 @@ return [ 'name' => '_APP_FUNCTIONS_MEMORY', 'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is 128.', 'introduction' => '0.7.0', - 'default' => '128', + 'default' => '256', 'required' => false, 'question' => '', ], diff --git a/app/tasks/install.php b/app/tasks/install.php index 4cb5341f0a..f855a086cf 100644 --- a/app/tasks/install.php +++ b/app/tasks/install.php @@ -6,14 +6,12 @@ use Appwrite\Docker\Compose; use Appwrite\Docker\Env; use Utopia\CLI\Console; use Utopia\Config\Config; -use Utopia\Validator\Mock; use Utopia\View; $cli ->task('install') ->desc('Install Appwrite') - ->param('version', APP_VERSION_STABLE, new Mock(), 'Appwrite version', true) - ->action(function ($version) { + ->action(function () { /** * 1. Start - DONE * 2. Check for older setup and get older version - DONE @@ -130,7 +128,7 @@ $cli $templateForCompose ->setParam('httpPort', $httpPort) ->setParam('httpsPort', $httpsPort) - ->setParam('version', $version) + ->setParam('version', APP_VERSION_STABLE) ; $templateForEnv @@ -147,12 +145,19 @@ $cli Console::exit(1); } + $env = ''; $stdout = ''; $stderr = ''; + foreach ($input as $key => $value) { + if($value) { + $env .= $key.'='.$value.' '; + } + } + Console::log("Running \"docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes\""); - $exit = Console::execute("docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr); + $exit = Console::execute("${env} docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr); if ($exit !== 0) { Console::error("Failed to install Appwrite dockers"); diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 9a182cc628..9d5c3d084a 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -266,10 +266,9 @@ services: - _APP_SMTP_PASSWORD appwrite-maintenance: + image: appwrite/appwrite: entrypoint: maintenance container_name: appwrite-maintenance - build: - context: . restart: unless-stopped networks: - appwrite @@ -307,8 +306,6 @@ services: - appwrite volumes: - appwrite-mariadb:/var/lib/mysql:rw - ports: - - "3306:3306" environment: - MYSQL_ROOT_PASSWORD=rootsecretpassword - MYSQL_DATABASE=${_APP_DB_SCHEMA}