diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 289f03c94b..53fa7488ff 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -89,9 +89,9 @@ services:
- _APP_DOMAIN
- _APP_DOMAIN_TARGET
- _APP_DOMAIN_FUNCTIONS
- - _APP_REDIS_HOST
- - _APP_REDIS_PORT
- - _APP_REDIS_USER
+ - _APP_REDIS_HOST
+ - _APP_REDIS_PORT
+ - _APP_REDIS_USER
- _APP_REDIS_PASS
- _APP_DB_HOST
- _APP_DB_PORT
@@ -111,26 +111,26 @@ services:
- _APP_STORAGE_ANTIVIRUS
- _APP_STORAGE_ANTIVIRUS_HOST
- _APP_STORAGE_ANTIVIRUS_PORT
- - _APP_STORAGE_DEVICE
- - _APP_STORAGE_S3_ACCESS_KEY
- - _APP_STORAGE_S3_SECRET
- - _APP_STORAGE_S3_REGION
- - _APP_STORAGE_S3_BUCKET
- - _APP_STORAGE_DO_SPACES_ACCESS_KEY
- - _APP_STORAGE_DO_SPACES_SECRET
- - _APP_STORAGE_DO_SPACES_REGION
- - _APP_STORAGE_DO_SPACES_BUCKET
- - _APP_STORAGE_BACKBLAZE_ACCESS_KEY
- - _APP_STORAGE_BACKBLAZE_SECRET
- - _APP_STORAGE_BACKBLAZE_REGION
- - _APP_STORAGE_BACKBLAZE_BUCKET
- - _APP_STORAGE_LINODE_ACCESS_KEY
- - _APP_STORAGE_LINODE_SECRET
- - _APP_STORAGE_LINODE_REGION
- - _APP_STORAGE_LINODE_BUCKET
- - _APP_STORAGE_WASABI_ACCESS_KEY
- - _APP_STORAGE_WASABI_SECRET
- - _APP_STORAGE_WASABI_REGION
+ - _APP_STORAGE_DEVICE
+ - _APP_STORAGE_S3_ACCESS_KEY
+ - _APP_STORAGE_S3_SECRET
+ - _APP_STORAGE_S3_REGION
+ - _APP_STORAGE_S3_BUCKET
+ - _APP_STORAGE_DO_SPACES_ACCESS_KEY
+ - _APP_STORAGE_DO_SPACES_SECRET
+ - _APP_STORAGE_DO_SPACES_REGION
+ - _APP_STORAGE_DO_SPACES_BUCKET
+ - _APP_STORAGE_BACKBLAZE_ACCESS_KEY
+ - _APP_STORAGE_BACKBLAZE_SECRET
+ - _APP_STORAGE_BACKBLAZE_REGION
+ - _APP_STORAGE_BACKBLAZE_BUCKET
+ - _APP_STORAGE_LINODE_ACCESS_KEY
+ - _APP_STORAGE_LINODE_SECRET
+ - _APP_STORAGE_LINODE_REGION
+ - _APP_STORAGE_LINODE_BUCKET
+ - _APP_STORAGE_WASABI_ACCESS_KEY
+ - _APP_STORAGE_WASABI_SECRET
+ - _APP_STORAGE_WASABI_REGION
- _APP_STORAGE_WASABI_BUCKET
- _APP_FUNCTIONS_SIZE_LIMIT
- _APP_FUNCTIONS_TIMEOUT
@@ -156,14 +156,14 @@ services:
- _APP_GRAPHQL_MAX_BATCH_SIZE
- _APP_GRAPHQL_MAX_COMPLEXITY
- _APP_GRAPHQL_MAX_DEPTH
- - _APP_VCS_GITHUB_APP_NAME
- - _APP_VCS_GITHUB_PRIVATE_KEY
- - _APP_VCS_GITHUB_APP_ID
- - _APP_VCS_GITHUB_WEBHOOK_SECRET
- - _APP_VCS_GITHUB_CLIENT_SECRET
- - _APP_VCS_GITHUB_CLIENT_ID
- - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
- - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
+ - _APP_VCS_GITHUB_APP_NAME
+ - _APP_VCS_GITHUB_PRIVATE_KEY
+ - _APP_VCS_GITHUB_APP_ID
+ - _APP_VCS_GITHUB_WEBHOOK_SECRET
+ - _APP_VCS_GITHUB_CLIENT_SECRET
+ - _APP_VCS_GITHUB_CLIENT_ID
+ - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
+ - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
- _APP_ASSISTANT_OPENAI_API_KEY
appwrite-realtime:
@@ -281,35 +281,35 @@ services:
- _APP_ENV
- _APP_WORKER_PER_CORE
- _APP_OPENSSL_KEY_V1
- - _APP_REDIS_HOST
- - _APP_REDIS_PORT
- - _APP_REDIS_USER
+ - _APP_REDIS_HOST
+ - _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_STORAGE_DEVICE
- - _APP_STORAGE_S3_ACCESS_KEY
- - _APP_STORAGE_S3_SECRET
- - _APP_STORAGE_S3_REGION
- - _APP_STORAGE_S3_BUCKET
- - _APP_STORAGE_DO_SPACES_ACCESS_KEY
- - _APP_STORAGE_DO_SPACES_SECRET
- - _APP_STORAGE_DO_SPACES_REGION
- - _APP_STORAGE_DO_SPACES_BUCKET
- - _APP_STORAGE_BACKBLAZE_ACCESS_KEY
- - _APP_STORAGE_BACKBLAZE_SECRET
- - _APP_STORAGE_BACKBLAZE_REGION
- - _APP_STORAGE_BACKBLAZE_BUCKET
- - _APP_STORAGE_LINODE_ACCESS_KEY
- - _APP_STORAGE_LINODE_SECRET
- - _APP_STORAGE_LINODE_REGION
- - _APP_STORAGE_LINODE_BUCKET
- - _APP_STORAGE_WASABI_ACCESS_KEY
- - _APP_STORAGE_WASABI_SECRET
- - _APP_STORAGE_WASABI_REGION
+ - _APP_STORAGE_DEVICE
+ - _APP_STORAGE_S3_ACCESS_KEY
+ - _APP_STORAGE_S3_SECRET
+ - _APP_STORAGE_S3_REGION
+ - _APP_STORAGE_S3_BUCKET
+ - _APP_STORAGE_DO_SPACES_ACCESS_KEY
+ - _APP_STORAGE_DO_SPACES_SECRET
+ - _APP_STORAGE_DO_SPACES_REGION
+ - _APP_STORAGE_DO_SPACES_BUCKET
+ - _APP_STORAGE_BACKBLAZE_ACCESS_KEY
+ - _APP_STORAGE_BACKBLAZE_SECRET
+ - _APP_STORAGE_BACKBLAZE_REGION
+ - _APP_STORAGE_BACKBLAZE_BUCKET
+ - _APP_STORAGE_LINODE_ACCESS_KEY
+ - _APP_STORAGE_LINODE_SECRET
+ - _APP_STORAGE_LINODE_REGION
+ - _APP_STORAGE_LINODE_BUCKET
+ - _APP_STORAGE_WASABI_ACCESS_KEY
+ - _APP_STORAGE_WASABI_SECRET
+ - _APP_STORAGE_WASABI_REGION
- _APP_STORAGE_WASABI_BUCKET
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
@@ -351,6 +351,9 @@ services:
restart: unless-stopped
networks:
- appwrite
+ volumes:
+ - appwrite-functions:/storage/functions:rw
+ - appwrite-builds:/storage/builds:rw
depends_on:
- redis
- mariadb
@@ -374,14 +377,14 @@ services:
- _APP_DB_PASS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- - _APP_VCS_GITHUB_APP_NAME
- - _APP_VCS_GITHUB_PRIVATE_KEY
- - _APP_VCS_GITHUB_APP_ID
- - _APP_FUNCTIONS_TIMEOUT
- - _APP_FUNCTIONS_BUILD_TIMEOUT
- - _APP_FUNCTIONS_CPUS
- - _APP_FUNCTIONS_MEMORY
- - _APP_OPTIONS_FORCE_HTTPS
+ - _APP_VCS_GITHUB_APP_NAME
+ - _APP_VCS_GITHUB_PRIVATE_KEY
+ - _APP_VCS_GITHUB_APP_ID
+ - _APP_FUNCTIONS_TIMEOUT
+ - _APP_FUNCTIONS_BUILD_TIMEOUT
+ - _APP_FUNCTIONS_CPUS
+ - _APP_FUNCTIONS_MEMORY
+ - _APP_OPTIONS_FORCE_HTTPS
- _APP_DOMAIN
appwrite-worker-certificates:
@@ -406,9 +409,9 @@ services:
- _APP_DOMAIN_TARGET
- _APP_DOMAIN_FUNCTIONS
- _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
- - _APP_REDIS_HOST
- - _APP_REDIS_PORT
- - _APP_REDIS_USER
+ - _APP_REDIS_HOST
+ - _APP_REDIS_PORT
+ - _APP_REDIS_USER
- _APP_REDIS_PASS
- _APP_DB_HOST
- _APP_DB_PORT
@@ -444,15 +447,15 @@ services:
- _APP_DB_USER
- _APP_DB_PASS
- _APP_FUNCTIONS_TIMEOUT
- - _APP_FUNCTIONS_BUILD_TIMEOUT
- - _APP_FUNCTIONS_CPUS
+ - _APP_FUNCTIONS_BUILD_TIMEOUT
+ - _APP_FUNCTIONS_CPUS
- _APP_FUNCTIONS_MEMORY
- _APP_EXECUTOR_SECRET
- _APP_EXECUTOR_HOST
- _APP_USAGE_STATS
- - _APP_DOCKER_HUB_USERNAME
- - _APP_DOCKER_HUB_PASSWORD
- - _APP_LOGGING_CONFIG
+ - _APP_DOCKER_HUB_USERNAME
+ - _APP_DOCKER_HUB_PASSWORD
+ - _APP_LOGGING_CONFIG
- _APP_LOGGING_PROVIDER
appwrite-worker-mails:
@@ -505,6 +508,37 @@ services:
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
+ appwrite-worker-migrations:
+ image: /:
+ entrypoint: worker-migrations
+ <<: *x-logging
+ container_name: appwrite-worker-migrations
+ restart: unless-stopped
+ networks:
+ - appwrite
+ depends_on:
+ - mariadb
+ environment:
+ - _APP_ENV
+ - _APP_WORKER_PER_CORE
+ - _APP_OPENSSL_KEY_V1
+ - _APP_DOMAIN
+ - _APP_DOMAIN_TARGET
+ - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
+ - _APP_REDIS_HOST
+ - _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_LOGGING_PROVIDER
+ - _APP_LOGGING_CONFIG
+ - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
+ - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
+
appwrite-maintenance:
image: /:
entrypoint: maintenance
@@ -518,10 +552,10 @@ services:
environment:
- _APP_ENV
- _APP_WORKER_PER_CORE
- - _APP_OPENSSL_KEY_V1
- _APP_DOMAIN
- _APP_DOMAIN_TARGET
- _APP_DOMAIN_FUNCTIONS
+ - _APP_OPENSSL_KEY_V1
- _APP_REDIS_HOST
- _APP_REDIS_PORT
- _APP_REDIS_USER
@@ -566,6 +600,7 @@ services:
- _APP_REDIS_PORT
- _APP_REDIS_USER
- _APP_REDIS_PASS
+ - _APP_USAGE_STATS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
@@ -578,6 +613,7 @@ services:
networks:
- appwrite
depends_on:
+ - mariadb
- redis
environment:
- _APP_ENV
@@ -586,12 +622,22 @@ services:
- _APP_REDIS_PORT
- _APP_REDIS_USER
- _APP_REDIS_PASS
- - _APP_DB_HOST
- - _APP_DB_PORT
- - _APP_DB_SCHEMA
- - _APP_DB_USER
+ - _APP_DB_HOST
+ - _APP_DB_PORT
+ - _APP_DB_SCHEMA
+ - _APP_DB_USER
- _APP_DB_PASS
+ appwrite-assistant:
+ image: appwrite/assistant:0.2.0
+ container_name: appwrite-assistant
+ <<: *x-logging
+ restart: unless-stopped
+ networks:
+ - appwrite
+ environment:
+ - _APP_ASSISTANT_OPENAI_API_KEY
+
openruntimes-executor:
container_name: openruntimes-executor
hostname: appwrite-executor
@@ -605,6 +651,8 @@ services:
- /var/run/docker.sock:/var/run/docker.sock
- appwrite-builds:/storage/builds:rw
- appwrite-functions:/storage/functions:rw
+ # Host mount nessessary to share files between executor and runtimes.
+ # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
- /tmp:/tmp:rw
environment:
- OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
diff --git a/docker-compose.yml b/docker-compose.yml
index 8fdaf34024..326bd62e00 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -171,6 +171,7 @@ services:
- _APP_MAINTENANCE_RETENTION_ABUSE
- _APP_MAINTENANCE_RETENTION_AUDIT
- _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
+ - _APP_MAINTENANCE_RETENTION_SCHEDULES
- _APP_SMS_PROVIDER
- _APP_SMS_FROM
- _APP_GRAPHQL_MAX_BATCH_SIZE