update appwrite

This commit is contained in:
Andrei Canta
2024-09-27 14:41:34 +03:00
parent e6ca3d4c99
commit 334f94878b
2 changed files with 106 additions and 40 deletions
+4 -1
View File
@@ -13,7 +13,8 @@ _APP_CONSOLE_WHITELIST_EMAILS=
_APP_CONSOLE_WHITELIST_IPS=
_APP_CONSOLE_HOSTNAMES=
_APP_SYSTEM_EMAIL_NAME=Appwrite
_APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io
_APP_SYSTEM_EMAIL_ADDRESS=noreply@appwrite.io
_APP_SYSTEM_TEAM_EMAIL=team@appwrite.io
_APP_SYSTEM_RESPONSE_FORMAT=
_APP_SYSTEM_SECURITY_EMAIL_ADDRESS=certs@appwrite.io
_APP_EMAIL_SECURITY=
@@ -25,6 +26,7 @@ _APP_USAGE_AGGREGATION_INTERVAL=30
_APP_USAGE_TIMESERIES_INTERVAL=30
_APP_USAGE_DATABASE_INTERVAL=900
_APP_WORKER_PER_CORE=6
_APP_CONSOLE_SESSION_ALERTS=disabled
_APP_REDIS_HOST=redis
_APP_REDIS_PORT=6379
_APP_REDIS_USER=
@@ -73,6 +75,7 @@ _APP_STORAGE_WASABI_SECRET=
_APP_STORAGE_WASABI_REGION=eu-central-1
_APP_STORAGE_WASABI_BUCKET=
_APP_FUNCTIONS_SIZE_LIMIT=30000000
_APP_FUNCTIONS_BUILD_SIZE_LIMIT=2000000000
_APP_FUNCTIONS_TIMEOUT=900
_APP_FUNCTIONS_BUILD_TIMEOUT=900
_APP_FUNCTIONS_CONTAINERS=10
+102 -39
View File
@@ -1,12 +1,13 @@
x-logging: &x-logging
logging:
driver: "json-file"
driver: 'json-file'
options:
max-file: "5"
max-size: "10m"
max-file: '5'
max-size: '10m'
services:
traefik:
image: traefik:2.11
# container_name: appwrite-traefik
<<: *x-logging
command:
- --providers.file.directory=/storage/config
@@ -17,6 +18,9 @@ services:
- --entrypoints.appwrite_web.address=:80
- --entrypoints.appwrite_websecure.address=:443
restart: unless-stopped
# ports:
# - 80:80
# - 443:443
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- appwrite-config:/storage/config:ro
@@ -28,7 +32,8 @@ services:
- appwrite
appwrite:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
# container_name: appwrite
<<: *x-logging
restart: unless-stopped
networks:
@@ -56,13 +61,14 @@ services:
depends_on:
- mariadb
- redis
# - clamav
# - clamav
environment:
- _APP_ENV
- _APP_WORKER_PER_CORE
- _APP_LOCALE
- _APP_CONSOLE_WHITELIST_ROOT
- _APP_CONSOLE_WHITELIST_EMAILS
- _APP_CONSOLE_SESSION_ALERTS
- _APP_CONSOLE_WHITELIST_IPS
- _APP_CONSOLE_HOSTNAMES
- _APP_SYSTEM_EMAIL_NAME
@@ -126,7 +132,6 @@ services:
- _APP_FUNCTIONS_RUNTIMES
- _APP_EXECUTOR_SECRET
- _APP_EXECUTOR_HOST
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- _APP_MAINTENANCE_INTERVAL
- _APP_MAINTENANCE_DELAY
@@ -151,9 +156,32 @@ services:
- _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
- _APP_ASSISTANT_OPENAI_API_KEY
appwrite-console:
<<: *x-logging
# container_name: appwrite-console
image: appwrite/console:5.0.12
restart: unless-stopped
networks:
- appwrite
labels:
- "traefik.enable=true"
- "traefik.constraint-label-stack=appwrite"
- "traefik.docker.network=appwrite"
- "traefik.http.services.appwrite_console.loadbalancer.server.port=80"
#ws
- traefik.http.routers.appwrite_console_http.entrypoints=appwrite_web
- traefik.http.routers.appwrite_console_http.rule=PathPrefix(`/console`)
- traefik.http.routers.appwrite_console_http.service=appwrite_console
# wss
- traefik.http.routers.appwrite_console_https.entrypoints=appwrite_websecure
- traefik.http.routers.appwrite_console_https.rule=PathPrefix(`/console`)
- traefik.http.routers.appwrite_console_https.service=appwrite_console
- traefik.http.routers.appwrite_console_https.tls=true
appwrite-realtime:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: realtime
# container_name: appwrite-realtime
<<: *x-logging
restart: unless-stopped
labels:
@@ -191,13 +219,13 @@ services:
- _APP_DB_USER
- _APP_DB_PASS
- _APP_USAGE_STATS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
appwrite-worker-audits:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-audits
<<: *x-logging
# container_name: appwrite-worker-audits
restart: unless-stopped
networks:
- appwrite
@@ -217,13 +245,13 @@ services:
- _APP_DB_SCHEMA
- _APP_DB_USER
- _APP_DB_PASS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
appwrite-worker-webhooks:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-webhooks
<<: *x-logging
# container_name: appwrite-worker-webhooks
restart: unless-stopped
networks:
- appwrite
@@ -245,13 +273,13 @@ services:
- _APP_REDIS_PORT
- _APP_REDIS_USER
- _APP_REDIS_PASS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
appwrite-worker-deletes:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-deletes
<<: *x-logging
# container_name: appwrite-worker-deletes
restart: unless-stopped
networks:
- appwrite
@@ -298,15 +326,18 @@ services:
- _APP_STORAGE_WASABI_SECRET
- _APP_STORAGE_WASABI_REGION
- _APP_STORAGE_WASABI_BUCKET
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- _APP_EXECUTOR_SECRET
- _APP_EXECUTOR_HOST
- _APP_MAINTENANCE_RETENTION_ABUSE
- _APP_MAINTENANCE_RETENTION_AUDIT
- _APP_MAINTENANCE_RETENTION_EXECUTION
appwrite-worker-databases:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-databases
<<: *x-logging
# container_name: appwrite-worker-databases
restart: unless-stopped
networks:
- appwrite
@@ -326,13 +357,13 @@ services:
- _APP_DB_SCHEMA
- _APP_DB_USER
- _APP_DB_PASS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
appwrite-worker-builds:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-builds
<<: *x-logging
# container_name: appwrite-worker-builds
restart: unless-stopped
networks:
- appwrite
@@ -357,7 +388,6 @@ services:
- _APP_DB_SCHEMA
- _APP_DB_USER
- _APP_DB_PASS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- _APP_VCS_GITHUB_APP_NAME
- _APP_VCS_GITHUB_PRIVATE_KEY
@@ -393,9 +423,10 @@ services:
- _APP_STORAGE_WASABI_BUCKET
appwrite-worker-certificates:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-certificates
<<: *x-logging
# container_name: appwrite-worker-certificates
restart: unless-stopped
networks:
- appwrite
@@ -422,13 +453,13 @@ services:
- _APP_DB_SCHEMA
- _APP_DB_USER
- _APP_DB_PASS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
appwrite-worker-functions:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-functions
<<: *x-logging
# container_name: appwrite-worker-functions
restart: unless-stopped
networks:
- appwrite
@@ -440,6 +471,8 @@ services:
- _APP_ENV
- _APP_WORKER_PER_CORE
- _APP_OPENSSL_KEY_V1
- _APP_DOMAIN
- _APP_OPTIONS_FORCE_HTTPS
- _APP_REDIS_HOST
- _APP_REDIS_PORT
- _APP_REDIS_USER
@@ -459,12 +492,12 @@ services:
- _APP_DOCKER_HUB_USERNAME
- _APP_DOCKER_HUB_PASSWORD
- _APP_LOGGING_CONFIG
- _APP_LOGGING_PROVIDER
appwrite-worker-mails:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-mails
<<: *x-logging
# container_name: appwrite-worker-mails
restart: unless-stopped
networks:
- appwrite
@@ -490,13 +523,13 @@ services:
- _APP_SMTP_SECURE
- _APP_SMTP_USERNAME
- _APP_SMTP_PASSWORD
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
appwrite-worker-messaging:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-messaging
<<: *x-logging
# container_name: appwrite-worker-messaging
restart: unless-stopped
networks:
- appwrite
@@ -517,7 +550,6 @@ services:
- _APP_DB_SCHEMA
- _APP_DB_USER
- _APP_DB_PASS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- _APP_SMS_FROM
- _APP_SMS_PROVIDER
@@ -544,9 +576,10 @@ services:
- _APP_STORAGE_WASABI_BUCKET
appwrite-worker-migrations:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-migrations
<<: *x-logging
# container_name: appwrite-worker-migrations
restart: unless-stopped
networks:
- appwrite
@@ -568,15 +601,15 @@ services:
- _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-task-maintenance:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: maintenance
<<: *x-logging
# container_name: appwrite-task-maintenance
restart: unless-stopped
networks:
- appwrite
@@ -607,8 +640,9 @@ services:
- _APP_MAINTENANCE_RETENTION_SCHEDULES
appwrite-worker-usage:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-usage
# container_name: appwrite-worker-usage
<<: *x-logging
restart: unless-stopped
networks:
@@ -630,14 +664,14 @@ services:
- _APP_REDIS_USER
- _APP_REDIS_PASS
- _APP_USAGE_STATS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- _APP_USAGE_AGGREGATION_INTERVAL
appwrite-worker-usage-dump:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: worker-usage-dump
<<: *x-logging
# container_name: appwrite-worker-usage-dump
networks:
- appwrite
depends_on:
@@ -657,13 +691,38 @@ services:
- _APP_REDIS_USER
- _APP_REDIS_PASS
- _APP_USAGE_STATS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- _APP_USAGE_AGGREGATION_INTERVAL
appwrite-task-scheduler-functions:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: schedule-functions
# container_name: appwrite-task-scheduler-functions
<<: *x-logging
restart: unless-stopped
networks:
- appwrite
depends_on:
- mariadb
- redis
environment:
- _APP_ENV
- _APP_WORKER_PER_CORE
- _APP_OPENSSL_KEY_V1
- _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
appwrite-task-scheduler-executions:
image: appwrite/appwrite:1.6.0
entrypoint: schedule-executions
# container_name: appwrite-task-scheduler-executions
<<: *x-logging
restart: unless-stopped
networks:
@@ -686,8 +745,9 @@ services:
- _APP_DB_PASS
appwrite-task-scheduler-messages:
image: appwrite/appwrite:1.5.10
image: appwrite/appwrite:1.6.0
entrypoint: schedule-messages
# container_name: appwrite-task-scheduler-messages
<<: *x-logging
restart: unless-stopped
networks:
@@ -711,6 +771,7 @@ services:
appwrite-assistant:
image: appwrite/assistant:0.4.0
# container_name: appwrite-assistant
<<: *x-logging
restart: unless-stopped
networks:
@@ -719,11 +780,12 @@ services:
- _APP_ASSISTANT_OPENAI_API_KEY
openruntimes-executor:
# container_name: openruntimes-executor
hostname: exc1
<<: *x-logging
restart: unless-stopped
stop_signal: SIGINT
image: openruntimes/executor:0.5.7
image: openruntimes/executor:0.6.11
networks:
- appwrite
- runtimes
@@ -743,7 +805,6 @@ services:
- OPR_EXECUTOR_ENV=$_APP_ENV
- OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
- OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
- OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
- OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
- OPR_EXECUTOR_STORAGE_DEVICE=$_APP_STORAGE_DEVICE
- OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY=$_APP_STORAGE_S3_ACCESS_KEY
@@ -769,6 +830,7 @@ services:
mariadb:
image: mariadb:10.11 # fix issues when upgrading using: mysql_upgrade -u root -p
# container_name: appwrite-mariadb
<<: *x-logging
restart: unless-stopped
networks:
@@ -781,10 +843,11 @@ services:
- MYSQL_USER=${_APP_DB_USER}
- MYSQL_PASSWORD=${_APP_DB_PASS}
- MARIADB_AUTO_UPGRADE=1
command: "mysqld --innodb-flush-method=fsync"
command: 'mysqld --innodb-flush-method=fsync'
redis:
image: redis:7.2.4-alpine
# container_name: appwrite-redis
<<: *x-logging
restart: unless-stopped
command: >
@@ -799,7 +862,7 @@ services:
# clamav:
# image: appwrite/clamav:1.2.0
# container_name: appwrite-clamav
container_name: appwrite-clamav
# restart: unless-stopped
# networks:
# - appwrite