CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-05-20 12:42:39 +12:00
Code Issues Projects Releases Wiki Activity

Added new env vars

Browse source
This commit is contained in:
Eldad Fux 2020-12-14 20:04:57 +02:00
parent 5986d61a47
commit 47769cefae
7 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.env
View file

@ -27,3 +27,6 @@ _APP_SMTP_PASSWORD=
_APP_STORAGE_LIMIT=10000000
_APP_FUNCTIONS_TIMEOUT=900
_APP_FUNCTIONS_CONTAINERS=10
_APP_FUNCTIONS_CPUS=1
_APP_FUNCTIONS_MEMORY=128
_APP_FUNCTIONS_MEMORY_SWAP=128

3
Dockerfile
View file

@ -92,6 +92,9 @@ ENV _APP_SERVER=swoole \
_APP_SMTP_PORT=25 \
_APP_FUNCTIONS_TIMEOUT=900 \
_APP_FUNCTIONS_CONTAINERS=10 \
_APP_FUNCTIONS_CPUS=1 \
_APP_FUNCTIONS_MEMORY=128 \
_APP_FUNCTIONS_MEMORY_SWAP=128 \
_APP_SETUP=self-hosted \
_APP_VERSION=$VERSION
#ENV _APP_SMTP_SECURE ''

18
app/config/variables.php
View file

@ -151,4 +151,22 @@ return [
'required' => false,
'question' => '',
],
[
'name' => '_APP_FUNCTIONS_CPUS',
'default' => '1',
'required' => false,
'question' => '',
],
[
'name' => '_APP_FUNCTIONS_MEMORY',
'default' => '128',
'required' => false,
'question' => '',
],
[
'name' => '_APP_FUNCTIONS_MEMORY_SWAP',
'default' => '128',
'required' => false,
'question' => '',
],
];

6
app/views/install/compose.phtml
View file

@ -77,6 +77,9 @@ services:
- _APP_STORAGE_LIMIT
- _APP_FUNCTIONS_TIMEOUT
- _APP_FUNCTIONS_CONTAINERS
- _APP_FUNCTIONS_CPUS
- _APP_FUNCTIONS_MEMORY
- _APP_FUNCTIONS_MEMORY_SWAP
appwrite-worker-usage:
image: appwrite/appwrite:<?php echo $version."\n"; ?>
@ -229,6 +232,9 @@ services:
- _APP_DB_PASS
- _APP_FUNCTIONS_TIMEOUT
- _APP_FUNCTIONS_CONTAINERS
- _APP_FUNCTIONS_CPUS
- _APP_FUNCTIONS_MEMORY
- _APP_FUNCTIONS_MEMORY_SWAP
appwrite-worker-mails:
image: appwrite/appwrite:<?php echo $version."\n"; ?>

6
app/workers/functions.php
View file

@ -387,9 +387,9 @@ class FunctionsV1
$exitCode = Console::execute("docker run \
-d \
--entrypoint=\"\" \
--cpus=1 \
--memory=128m \
--memory-swap=128m \
--cpus=".App::getEnv('_APP_FUNCTIONS_CPUS', '1')." \
--memory=".App::getEnv('_APP_FUNCTIONS_MEMORY', '128')."m \
--memory-swap=".App::getEnv('_APP_FUNCTIONS_MEMORY_SWAP', '128')."m \
--name={$container} \
--label appwrite-type=function \
--label appwrite-created=".$executionTime." \

6
docker-compose.yml
View file

@ -91,6 +91,9 @@ services:
- _APP_STORAGE_LIMIT
- _APP_FUNCTIONS_TIMEOUT
- _APP_FUNCTIONS_CONTAINERS
- _APP_FUNCTIONS_CPUS
- _APP_FUNCTIONS_MEMORY
- _APP_FUNCTIONS_MEMORY_SWAP
appwrite-worker-usage:
entrypoint: worker-usage
@ -270,6 +273,9 @@ services:
- _APP_DB_PASS
- _APP_FUNCTIONS_TIMEOUT
- _APP_FUNCTIONS_CONTAINERS
- _APP_FUNCTIONS_CPUS
- _APP_FUNCTIONS_MEMORY
- _APP_FUNCTIONS_MEMORY_SWAP
appwrite-worker-mails:
entrypoint: worker-mails

6
tests/resources/docker/docker-compose.yml
View file

@ -83,6 +83,9 @@ services:
- _APP_STORAGE_LIMIT
- _APP_FUNCTIONS_TIMEOUT
- _APP_FUNCTIONS_CONTAINERS
- _APP_FUNCTIONS_CPUS
- _APP_FUNCTIONS_MEMORY
- _APP_FUNCTIONS_MEMORY_SWAP
appwrite-worker-usage:
entrypoint: worker-usage
@ -239,6 +242,9 @@ services:
- _APP_DB_PASS
- _APP_FUNCTIONS_TIMEOUT
- _APP_FUNCTIONS_CONTAINERS
- _APP_FUNCTIONS_CPUS
- _APP_FUNCTIONS_MEMORY
- _APP_FUNCTIONS_MEMORY_SWAP
appwrite-worker-mails:
entrypoint: worker-mails