Merge branch '0.7.x' of github.com:appwrite/appwrite into swoole-and-functions

This commit is contained in:
Eldad Fux 2020-10-29 12:56:26 +02:00
commit 9c2bcce002
4 changed files with 6 additions and 3 deletions

2
.env
View file

@ -24,6 +24,6 @@ _APP_SMTP_PORT=25
_APP_SMTP_SECURE=
_APP_SMTP_USERNAME=
_APP_SMTP_PASSWORD=
_APP_STORAGE_LIMIT=100000000
_APP_STORAGE_LIMIT=10000000
_APP_FUNCTIONS_TIMEOUT=900
_APP_FUNCTIONS_CONTAINERS=10

View file

@ -135,7 +135,7 @@ return [
],
[
'name' => '_APP_STORAGE_LIMIT',
'default' => '100000000',
'default' => '10000000',
'required' => false,
'question' => '',
],

View file

@ -23,7 +23,7 @@ sleep(2);
$http = new Server("0.0.0.0", 80);
$payloadSize = max(4000000 /* 4mb */, App::getEnv('_APP_STORAGE_LIMIT', 10000000));
$payloadSize = max(4000000 /* 4mb */, App::getEnv('_APP_STORAGE_LIMIT', 10000000 /* 10mb */));
$http
->set([

View file

@ -243,6 +243,9 @@ services:
- _APP_REDIS_PORT
- _APP_SMTP_HOST
- _APP_SMTP_PORT
- _APP_SMTP_SECURE
- _APP_SMTP_USERNAME
- _APP_SMTP_PASSWORD
appwrite-schedule:
image: appwrite/appwrite:<?php echo $version."\n"; ?>