diff --git a/Dockerfile b/Dockerfile index 44d1b5ff82..ddc12370c1 100755 --- a/Dockerfile +++ b/Dockerfile @@ -183,18 +183,11 @@ ENV DOCKER_COMPOSE_VERSION=v2.5.0 ENV _APP_SERVER=swoole \ _APP_ENV=production \ _APP_LOCALE=en \ - _APP_WORKER_PER_CORE= \ _APP_DOMAIN=localhost \ _APP_DOMAIN_TARGET=localhost \ _APP_HOME=https://appwrite.io \ _APP_EDITION=community \ _APP_CONSOLE_WHITELIST_ROOT=enabled \ - _APP_CONSOLE_WHITELIST_EMAILS= \ - _APP_CONSOLE_WHITELIST_IPS= \ - _APP_SYSTEM_EMAIL_NAME= \ - _APP_SYSTEM_EMAIL_ADDRESS= \ - _APP_SYSTEM_RESPONSE_FORMAT= \ - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS= \ _APP_OPTIONS_ABUSE=enabled \ _APP_OPTIONS_FORCE_HTTPS=disabled \ _APP_OPENSSL_KEY_V1=your-secret-key \ @@ -202,7 +195,6 @@ ENV _APP_SERVER=swoole \ _APP_STORAGE_ANTIVIRUS=enabled \ _APP_STORAGE_ANTIVIRUS_HOST=clamav \ _APP_STORAGE_ANTIVIRUS_PORT=3310 \ - _APP_CONNECTIONS_STORAGE= \ _APP_REDIS_HOST=redis \ _APP_REDIS_PORT=6379 \ _APP_DB_HOST=mariadb \ @@ -214,13 +206,6 @@ ENV _APP_SERVER=swoole \ _APP_INFLUXDB_PORT=8086 \ _APP_STATSD_HOST=telegraf \ _APP_STATSD_PORT=8125 \ - _APP_SMTP_HOST= \ - _APP_SMTP_PORT= \ - _APP_SMTP_SECURE= \ - _APP_SMTP_USERNAME= \ - _APP_SMTP_PASSWORD= \ - _APP_SMS_PROVIDER= \ - _APP_SMS_FROM= \ _APP_FUNCTIONS_SIZE_LIMIT=30000000 \ _APP_FUNCTIONS_TIMEOUT=900 \ _APP_FUNCTIONS_CPUS=1 \ @@ -236,9 +221,7 @@ ENV _APP_SERVER=swoole \ # 1 Day = 86400 s _APP_MAINTENANCE_RETENTION_ABUSE=86400 \ _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000 \ - _APP_MAINTENANCE_INTERVAL=86400 \ - _APP_LOGGING_PROVIDER= \ - _APP_LOGGING_CONFIG= + _APP_MAINTENANCE_INTERVAL=86400 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/app/controllers/api/project.php b/app/controllers/api/project.php index 049a957a4a..49b493f00a 100644 --- a/app/controllers/api/project.php +++ b/app/controllers/api/project.php @@ -106,7 +106,6 @@ App::get('/v1/project/usage') 'executions' => $stats[$metrics[6]] ?? [], 'buckets' => $stats[$metrics[7]] ?? [], ]); - } $response->dynamic($usage, Response::MODEL_USAGE_PROJECT); diff --git a/app/init.php b/app/init.php index a6b5822efe..f9442b8a86 100644 --- a/app/init.php +++ b/app/init.php @@ -551,7 +551,7 @@ $register->set('pools', function () { ], ]; - $instances = 2; // REST, Realtime + $instances = 3; // REST, Realtime, CLI $workerCount = swoole_cpu_num() * intval(App::getEnv('_APP_WORKER_PER_CORE', 6)); $maxConnections = App::getenv('_APP_CONNECTIONS_MAX', 251); $instanceConnections = $maxConnections / $instances; diff --git a/docker-compose.yml b/docker-compose.yml index 3011e63af6..76813e76e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -564,19 +564,6 @@ services: - _APP_MAINTENANCE_RETENTION_AUDIT - _APP_MAINTENANCE_RETENTION_SCHEDULES - appwrite-volume-sync: - entrypoint: volume-sync - <<: *x-logging - container_name: appwrite-volume-sync - image: appwrite-dev - command: - - --source=/data/src/ --destination=/data/dest/ --interval=10 - networks: - - appwrite - # volumes: # Mount the rsync source and destination directories - # - /nfs/config:/data/src - # - /storage/config:/data/dest - appwrite-usage: entrypoint: usage <<: *x-logging