Merge branch 'coollabsio:v4.x' into add-service-gramps-web

2026-04-26 06:19:51 +00:00 · 2025-10-09 00:11:33 +03:00
parent f5a4c5ac3f 5295a2fc07
commit 0a5987a512
262 changed files with 15695 additions and 6012 deletions
@@ -23,6 +23,7 @@ services:
    environment:
      - SERVICE_URL_APPWRITE=/
      - _APP_ENV=${_APP_ENV:-production}
+      - _APP_EDITION=${_APP_EDITION:-self-hosted}
      - _APP_WORKER_PER_CORE=${_APP_WORKER_PER_CORE:-6}
      - _APP_LOCALE=${_APP_LOCALE:-en}
      - _APP_COMPRESSION_MIN_SIZE_BYTES=${_APP_COMPRESSION_MIN_SIZE_BYTES}
@@ -41,11 +42,14 @@ services:
      - _APP_OPTIONS_FORCE_HTTPS=${_APP_OPTIONS_FORCE_HTTPS:-disabled}
      - _APP_OPTIONS_ROUTER_FORCE_HTTPS=${_APP_OPTIONS_ROUTER_FORCE_HTTPS:-disabled}
      - _APP_OPENSSL_KEY_V1=$SERVICE_PASSWORD_64_APPWRITE
-      - _APP_DOMAIN=$SERVICE_URL_APPWRITE
+      - _APP_CONSOLE_DOMAIN=${_APP_CONSOLE_DOMAIN}
+      - _APP_DOMAIN=${_APP_DOMAIN:-$SERVICE_FQDN_APPWRITE}
      - _APP_DOMAIN_TARGET_CNAME=${_APP_DOMAIN_TARGET_CNAME:-localhost}
      - _APP_DOMAIN_TARGET_AAAA=${_APP_DOMAIN_TARGET_AAAA:-::1}
      - _APP_DOMAIN_TARGET_A=${_APP_DOMAIN_TARGET_A:-127.0.0.1}
-      - _APP_DOMAIN_FUNCTIONS=$SERVICE_URL_APPWRITE
+      - _APP_DOMAIN_TARGET_CAA=${_APP_DOMAIN_TARGET_CAA}
+      - _APP_DOMAIN_FUNCTIONS=${_APP_DOMAIN_FUNCTIONS:-functions.$SERVICE_FQDN_APPWRITE}
+      - _APP_DNS=${_APP_DNS}
      - _APP_REDIS_HOST=${_APP_REDIS_HOST:-appwrite-redis}
      - _APP_REDIS_PORT=${_APP_REDIS_PORT:-6379}
      - _APP_REDIS_USER=${_APP_REDIS_USER}
@@ -96,7 +100,7 @@ services:
      - _APP_COMPUTE_MEMORY=${_APP_COMPUTE_MEMORY:-0}
      - _APP_FUNCTIONS_RUNTIMES=${_APP_FUNCTIONS_RUNTIMES:-node-20.0,php-8.2,python-3.11,ruby-3.2}
      - _APP_SITES_RUNTIMES=${_APP_SITES_RUNTIMES}
-      - _APP_DOMAIN_SITES=${_APP_DOMAIN_SITES:-appwrite.network}
+      - _APP_DOMAIN_SITES=${_APP_DOMAIN_SITES:-sites.$SERVICE_FQDN_APPWRITE}
      - _APP_EXECUTOR_SECRET=$SERVICE_PASSWORD_64_APPWRITE
      - _APP_EXECUTOR_HOST=${_APP_EXECUTOR_HOST:-http://appwrite-executor/v1}
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
@@ -124,9 +128,20 @@ services:
      - _APP_MIGRATIONS_FIREBASE_CLIENT_ID=${_APP_MIGRATIONS_FIREBASE_CLIENT_ID}
      - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET=${_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET}
      - _APP_ASSISTANT_OPENAI_API_KEY=${_APP_ASSISTANT_OPENAI_API_KEY}
+      - _APP_MESSAGE_SMS_TEST_DSN=${_APP_MESSAGE_SMS_TEST_DSN}
+      - _APP_MESSAGE_EMAIL_TEST_DSN=${_APP_MESSAGE_EMAIL_TEST_DSN}
+      - _APP_MESSAGE_PUSH_TEST_DSN=${_APP_MESSAGE_PUSH_TEST_DSN}
+      - _APP_CONSOLE_COUNTRIES_DENYLIST=${_APP_CONSOLE_COUNTRIES_DENYLIST}
+      - _APP_EXPERIMENT_LOGGING_PROVIDER=${_APP_EXPERIMENT_LOGGING_PROVIDER}
+      - _APP_EXPERIMENT_LOGGING_CONFIG=${_APP_EXPERIMENT_LOGGING_CONFIG}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+      - _APP_DATABASE_SHARED_TABLES_V1=${_APP_DATABASE_SHARED_TABLES_V1}
+      - _APP_DATABASE_SHARED_NAMESPACE=${_APP_DATABASE_SHARED_NAMESPACE}
+      - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT=${_APP_FUNCTIONS_CREATION_ABUSE_LIMIT}
+      - _APP_CUSTOM_DOMAIN_DENY_LIST=${_APP_CUSTOM_DOMAIN_DENY_LIST}

  appwrite-console:
-    image: appwrite/console:6.0.13
+    image: appwrite/console:6.1.28
    container_name: appwrite-console
    environment:
      - SERVICE_URL_APPWRITE=/console
@@ -156,6 +171,7 @@ services:
      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
      - _APP_USAGE_STATS=${_APP_USAGE_STATS:-enabled}
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-worker-audits:
    image: appwrite/appwrite:1.7.4
@@ -178,6 +194,7 @@ services:
      - _APP_DB_USER=$SERVICE_USER_MARIADB
      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-worker-webhooks:
    image: appwrite/appwrite:1.7.4
@@ -202,6 +219,8 @@ services:
      - _APP_REDIS_USER=${_APP_REDIS_USER}
      - _APP_REDIS_PASS=${_APP_REDIS_PASS}
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
+      - _APP_WEBHOOK_MAX_FAILED_ATTEMPTS=${_APP_WEBHOOK_MAX_FAILED_ATTEMPTS}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-worker-deletes:
    image: appwrite/appwrite:1.7.4
@@ -255,12 +274,11 @@ services:
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
      - _APP_EXECUTOR_SECRET=$SERVICE_PASSWORD_64_APPWRITE
      - _APP_EXECUTOR_HOST=${_APP_EXECUTOR_HOST:-http://appwrite-executor/v1}
-      - _APP_MAINTENANCE_RETENTION_ABUSE=${_APP_MAINTENANCE_RETENTION_ABUSE:-86400}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+      - _APP_DATABASE_SHARED_TABLES_V1=${_APP_DATABASE_SHARED_TABLES_V1}
+      - _APP_EMAIL_CERTIFICATES=${_APP_EMAIL_CERTIFICATES}
      - _APP_MAINTENANCE_RETENTION_AUDIT=${_APP_MAINTENANCE_RETENTION_AUDIT:-1209600}
      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=${_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE}
-      - _APP_MAINTENANCE_RETENTION_EXECUTION=${_APP_MAINTENANCE_RETENTION_EXECUTION:-1209600}
-      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS=${_APP_SYSTEM_SECURITY_EMAIL_ADDRESS}
-      - _APP_EMAIL_CERTIFICATES=${_APP_EMAIL_CERTIFICATES}

  appwrite-worker-databases:
    image: appwrite/appwrite:1.7.4
@@ -283,6 +301,9 @@ services:
      - _APP_DB_USER=$SERVICE_USER_MARIADB
      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
+      - _APP_WORKERS_NUM=${_APP_WORKERS_NUM}
+      - _APP_QUEUE_NAME=${_APP_QUEUE_NAME}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-worker-builds:
    image: appwrite/appwrite:1.7.4
@@ -323,7 +344,7 @@ services:
      - _APP_COMPUTE_SIZE_LIMIT=${_APP_COMPUTE_SIZE_LIMIT:-30000000}
      - _APP_OPTIONS_FORCE_HTTPS=${_APP_OPTIONS_FORCE_HTTPS:-disabled}
      - _APP_OPTIONS_ROUTER_FORCE_HTTPS=${_APP_OPTIONS_ROUTER_FORCE_HTTPS:-disabled}
-      - _APP_DOMAIN=$SERVICE_URL_APPWRITE
+      - _APP_DOMAIN=${_APP_DOMAIN:-$SERVICE_FQDN_APPWRITE}
      - _APP_STORAGE_DEVICE=${_APP_STORAGE_DEVICE:-local}
      - _APP_STORAGE_S3_ACCESS_KEY=${_APP_STORAGE_S3_ACCESS_KEY}
      - _APP_STORAGE_S3_SECRET=${_APP_STORAGE_S3_SECRET}
@@ -346,7 +367,10 @@ services:
      - _APP_STORAGE_WASABI_SECRET=${_APP_STORAGE_WASABI_SECRET}
      - _APP_STORAGE_WASABI_REGION=${_APP_STORAGE_WASABI_REGION:-eu-central-1}
      - _APP_STORAGE_WASABI_BUCKET=${_APP_STORAGE_WASABI_BUCKET}
-      - _APP_DOMAIN_SITES=${_APP_DOMAIN_SITES}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+      - _APP_DOMAIN_SITES=${_APP_DOMAIN_SITES:-sites.$SERVICE_FQDN_APPWRITE}
+      - _APP_BROWSER_HOST=${_APP_BROWSER_HOST}
+      - _APP_CONSOLE_DOMAIN=${_APP_CONSOLE_DOMAIN}

  appwrite-worker-certificates:
    image: appwrite/appwrite:1.7.4
@@ -362,11 +386,13 @@ services:
      - _APP_ENV=${_APP_ENV:-production}
      - _APP_WORKER_PER_CORE=${_APP_WORKER_PER_CORE:-6}
      - _APP_OPENSSL_KEY_V1=$SERVICE_PASSWORD_64_APPWRITE
-      - _APP_DOMAIN=$SERVICE_URL_APPWRITE
+      - _APP_DOMAIN=${_APP_DOMAIN:-$SERVICE_FQDN_APPWRITE}
      - _APP_DOMAIN_TARGET_CNAME=${_APP_DOMAIN_TARGET_CNAME}
      - _APP_DOMAIN_TARGET_AAAA=${_APP_DOMAIN_TARGET_AAAA}
      - _APP_DOMAIN_TARGET_A=${_APP_DOMAIN_TARGET_A}
-      - _APP_DOMAIN_FUNCTIONS=$SERVICE_URL_APPWRITE
+      - _APP_DOMAIN_TARGET_CAA=${_APP_DOMAIN_TARGET_CAA}
+      - _APP_DOMAIN_FUNCTIONS=${_APP_DOMAIN_FUNCTIONS:-functions.$SERVICE_FQDN_APPWRITE}
+      - _APP_DNS=${_APP_DNS}
      - _APP_EMAIL_CERTIFICATES=${_APP_EMAIL_CERTIFICATES:-enabled}
      - _APP_REDIS_HOST=${_APP_REDIS_HOST:-appwrite-redis}
      - _APP_REDIS_PORT=${_APP_REDIS_PORT:-6379}
@@ -378,6 +404,7 @@ services:
      - _APP_DB_USER=$SERVICE_USER_MARIADB
      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-worker-functions:
    image: appwrite/appwrite:1.7.4
@@ -391,7 +418,7 @@ services:
      - _APP_ENV=${_APP_ENV:-production}
      - _APP_WORKER_PER_CORE=${_APP_WORKER_PER_CORE:-6}
      - _APP_OPENSSL_KEY_V1=$SERVICE_PASSWORD_64_APPWRITE
-      - _APP_DOMAIN=$SERVICE_URL_APPWRITE
+      - _APP_DOMAIN=${_APP_DOMAIN:-$SERVICE_FQDN_APPWRITE}
      - _APP_OPTIONS_FORCE_HTTPS=${_APP_OPTIONS_FORCE_HTTPS:-disabled}
      - _APP_REDIS_HOST=${_APP_REDIS_HOST:-appwrite-redis}
      - _APP_REDIS_PORT=${_APP_REDIS_PORT:-6379}
@@ -413,6 +440,8 @@ services:
      - _APP_DOCKER_HUB_USERNAME=${_APP_DOCKER_HUB_USERNAME}
      - _APP_DOCKER_HUB_PASSWORD=${_APP_DOCKER_HUB_PASSWORD}
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
+      - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-worker-mails:
    image: appwrite/appwrite:1.7.4
@@ -420,6 +449,7 @@ services:
    container_name: appwrite-worker-mails
    depends_on:
      - appwrite-redis
+      - appwrite-mariadb
    environment:
      - _APP_ENV=${_APP_ENV:-production}
      - _APP_WORKER_PER_CORE=${_APP_WORKER_PER_CORE:-6}
@@ -441,8 +471,9 @@ services:
      - _APP_SMTP_USERNAME=${_APP_SMTP_USERNAME}
      - _APP_SMTP_PASSWORD=${_APP_SMTP_PASSWORD}
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
-      - _APP_DOMAIN=$SERVICE_URL_APPWRITE
+      - _APP_DOMAIN=${_APP_DOMAIN:-$SERVICE_FQDN_APPWRITE}
      - _APP_OPTIONS_FORCE_HTTPS=${_APP_OPTIONS_FORCE_HTTPS:-disabled}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-worker-messaging:
    image: appwrite/appwrite:1.7.4
@@ -468,6 +499,7 @@ services:
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
      - _APP_SMS_FROM=${_APP_SMS_FROM}
      - _APP_SMS_PROVIDER=${_APP_SMS_PROVIDER}
+      - _APP_SMS_PROJECTS_DENY_LIST=${_APP_SMS_PROJECTS_DENY_LIST}
      - _APP_STORAGE_DEVICE=${_APP_STORAGE_DEVICE:-local}
      - _APP_STORAGE_S3_ACCESS_KEY=${_APP_STORAGE_S3_ACCESS_KEY}
      - _APP_STORAGE_S3_SECRET=${_APP_STORAGE_S3_SECRET}
@@ -490,6 +522,7 @@ services:
      - _APP_STORAGE_WASABI_SECRET=${_APP_STORAGE_WASABI_SECRET}
      - _APP_STORAGE_WASABI_REGION=${_APP_STORAGE_WASABI_REGION:-eu-central-1}
      - _APP_STORAGE_WASABI_BUCKET=${_APP_STORAGE_WASABI_BUCKET}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-worker-migrations:
    image: appwrite/appwrite:1.7.4
@@ -503,10 +536,12 @@ services:
      - _APP_ENV=${_APP_ENV:-production}
      - _APP_WORKER_PER_CORE=${_APP_WORKER_PER_CORE:-6}
      - _APP_OPENSSL_KEY_V1=$SERVICE_PASSWORD_64_APPWRITE
-      - _APP_DOMAIN=$SERVICE_URL_APPWRITE
+      - _APP_DOMAIN=${_APP_DOMAIN:-$SERVICE_FQDN_APPWRITE}
      - _APP_DOMAIN_TARGET_CNAME=${_APP_DOMAIN_TARGET_CNAME}
      - _APP_DOMAIN_TARGET_AAAA=${_APP_DOMAIN_TARGET_AAAA}
      - _APP_DOMAIN_TARGET_A=${_APP_DOMAIN_TARGET_A}
+      - _APP_DOMAIN_TARGET_CAA=${_APP_DOMAIN_TARGET_CAA}
+      - _APP_DNS=${_APP_DNS}
      - _APP_EMAIL_SECURITY=${_APP_EMAIL_SECURITY:-certs@appwrite.io}
      - _APP_REDIS_HOST=${_APP_REDIS_HOST:-appwrite-redis}
      - _APP_REDIS_PORT=${_APP_REDIS_PORT:-6379}
@@ -520,6 +555,7 @@ services:
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
      - _APP_MIGRATIONS_FIREBASE_CLIENT_ID=${_APP_MIGRATIONS_FIREBASE_CLIENT_ID}
      - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET=${_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-task-maintenance:
    image: appwrite/appwrite:1.7.4
@@ -530,11 +566,13 @@ services:
    environment:
      - _APP_ENV=${_APP_ENV:-production}
      - _APP_WORKER_PER_CORE=${_APP_WORKER_PER_CORE:-6}
-      - _APP_DOMAIN=$SERVICE_URL_APPWRITE
+      - _APP_DOMAIN=${_APP_DOMAIN:-$SERVICE_FQDN_APPWRITE}
      - _APP_DOMAIN_TARGET_CNAME=${_APP_DOMAIN_TARGET_CNAME}
      - _APP_DOMAIN_TARGET_AAAA=${_APP_DOMAIN_TARGET_AAAA}
      - _APP_DOMAIN_TARGET_A=${_APP_DOMAIN_TARGET_A}
-      - _APP_DOMAIN_FUNCTIONS=$SERVICE_URL_APPWRITE
+      - _APP_DOMAIN_TARGET_CAA=${_APP_DOMAIN_TARGET_CAA}
+      - _APP_DOMAIN_FUNCTIONS=${_APP_DOMAIN_FUNCTIONS:-functions.$SERVICE_FQDN_APPWRITE}
+      - _APP_DNS=${_APP_DNS}
      - _APP_OPENSSL_KEY_V1=$SERVICE_PASSWORD_64_APPWRITE
      - _APP_REDIS_HOST=${_APP_REDIS_HOST:-appwrite-redis}
      - _APP_REDIS_PORT=${_APP_REDIS_PORT:-6379}
@@ -545,14 +583,16 @@ services:
      - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
      - _APP_DB_USER=$SERVICE_USER_MARIADB
      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
-      - _APP_MAINTENANCE_INTERVAL=${_APP_MAINTENANCE_INTERVAL}
-      - _APP_MAINTENANCE_RETENTION_EXECUTION=${_APP_MAINTENANCE_RETENTION_EXECUTION}
+      - _APP_MAINTENANCE_INTERVAL=${_APP_MAINTENANCE_INTERVAL:-86400}
+      - _APP_MAINTENANCE_RETENTION_EXECUTION=${_APP_MAINTENANCE_RETENTION_EXECUTION:-1209600}
      - _APP_MAINTENANCE_RETENTION_CACHE=${_APP_MAINTENANCE_RETENTION_CACHE:-2592000}
      - _APP_MAINTENANCE_RETENTION_ABUSE=${_APP_MAINTENANCE_RETENTION_ABUSE:-86400}
      - _APP_MAINTENANCE_RETENTION_AUDIT=${_APP_MAINTENANCE_RETENTION_AUDIT:-1209600}
      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=${_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE}
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=${_APP_MAINTENANCE_RETENTION_USAGE_HOURLY:-8640000}
      - _APP_MAINTENANCE_RETENTION_SCHEDULES=${_APP_MAINTENANCE_RETENTION_SCHEDULES:-86400}
+      - _APP_MAINTENANCE_START_TIME=${_APP_MAINTENANCE_START_TIME}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-task-stats-resources:
    image: appwrite/appwrite:1.7.4
@@ -626,6 +666,7 @@ services:
      - _APP_USAGE_STATS=${_APP_USAGE_STATS:-enabled}
      - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
      - _APP_USAGE_AGGREGATION_INTERVAL=${_APP_USAGE_AGGREGATION_INTERVAL:-30}
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-task-scheduler-functions:
    image: appwrite/appwrite:1.7.4
@@ -647,6 +688,7 @@ services:
      - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
      - _APP_DB_USER=$SERVICE_USER_MARIADB
      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-task-scheduler-executions:
    image: appwrite/appwrite:1.7.4
@@ -668,6 +710,7 @@ services:
      - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
      - _APP_DB_USER=$SERVICE_USER_MARIADB
      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-task-scheduler-messages:
    image: appwrite/appwrite:1.7.4
@@ -689,9 +732,10 @@ services:
      - _APP_DB_SCHEMA=${_APP_DB_SCHEMA:-appwrite}
      - _APP_DB_USER=$SERVICE_USER_MARIADB
      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
+      - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}

  appwrite-assistant:
-    image: appwrite/assistant:0.4.0
+    image: appwrite/assistant:0.8.3
    container_name: appwrite-assistant
    environment:
      - _APP_ASSISTANT_OPENAI_API_KEY=${_APP_ASSISTANT_OPENAI_API_KEY}
@@ -699,12 +743,13 @@ services:
  appwrite-browser:
    image: appwrite/browser:0.2.4
    container_name: appwrite-browser
+    hostname: appwrite-browser

  openruntimes-executor:
    container_name: openruntimes-executor
    hostname: appwrite-executor
    stop_signal: SIGINT
-    image: openruntimes/executor:0.7.14
+    image: openruntimes/executor:0.8.6
    networks:
      - runtimes
    volumes:
@@ -714,6 +759,7 @@ services:
      - appwrite-sites:/storage/sites:rw
      - /tmp:/tmp:rw
    environment:
+      - OPR_EXECUTOR_IMAGE_PULL=disabled
      - OPR_EXECUTOR_INACTIVE_TRESHOLD=${_APP_COMPUTE_INACTIVE_THRESHOLD}
      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=${_APP_COMPUTE_MAINTENANCE_INTERVAL}
      - OPR_EXECUTOR_NETWORK=${_APP_COMPUTE_RUNTIMES_NETWORK:-runtimes}
@@ -6,19 +6,24 @@
 # port: 8090

 # When adding a System in the UI, the Host/IP must be beszel-agent (or the container name, ex: beszel-agent-pswog4s8wks4o8osw44cw0k8)
-# Add the public Key in "Key" env variable below
+# Add the public Key in "Key" env variable and token in the "Token" variable below (These are obtained from Beszel UI)
 services:
  beszel:
-    image: henrygd/beszel:latest
+    image: 'henrygd/beszel:0.12.10'
    environment:
      - SERVICE_URL_BESZEL_8090
    volumes:
-      - beszel_data:/beszel_data
-
+      - 'beszel_data:/beszel_data'
+      - 'beszel_socket:/beszel_socket'
  beszel-agent:
-    image: henrygd/beszel-agent
+    image: 'henrygd/beszel-agent:0.12.10'
    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - beszel_agent_data:/var/lib/beszel-agent
+      - beszel_socket:/beszel_socket
+      - '/var/run/docker.sock:/var/run/docker.sock:ro'
    environment:
-      - PORT=45876
-      - KEY=${KEY}
+      - LISTEN=/beszel_socket/beszel.sock
+      - HUB_URL=http://beszel:8090
+      - 'TOKEN=${TOKEN}'
+      - 'KEY=${KEY}'
+
@@ -35,6 +35,7 @@ services:
      - SERVICE_URL_BUGSINK_8000
      - BASE_URL=$SERVICE_URL_BUGSINK_8000
      - DATABASE_URL=mysql://${SERVICE_USER_BUGSINK}:$SERVICE_PASSWORD_BUGSINK@mysql:3306/${MYSQL_DATABASE:-bugsink}
+      - BEHIND_HTTPS_PROXY=True
    depends_on:
      mysql:
        condition: service_healthy
@@ -0,0 +1,95 @@
+# documentation: https://help.ente.io/self-hosting/installation/compose
+# slogan: Ente Photos is a fully open source, End to End Encrypted alternative to Google Photos and Apple Photos.
+# category: media
+# tags: photos,gallery,backup,encryption,privacy,self-hosted,google-photos,alternative
+# logo: svgs/ente-photos.svg
+# port: 8080
+
+services:
+  museum:
+    image: ghcr.io/ente-io/server:latest
+    environment:
+      - SERVICE_URL_MUSEUM_8080
+      # Database configuration
+      - POSTGRES_HOST=postgres
+      - POSTGRES_PORT=5432
+      - POSTGRES_DB=${POSTGRES_DB:-ente_db}
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      # S3/MinIO configuration
+      - S3_ARE_LOCAL_BUCKETS=true
+      - S3_USE_PATH_STYLE_URLS=true
+      - S3_B2_EU_CEN_KEY=${SERVICE_USER_MINIO}
+      - S3_B2_EU_CEN_SECRET=${SERVICE_PASSWORD_MINIO}
+      - S3_B2_EU_CEN_ENDPOINT=${SERVICE_URL_MINIO_3200}
+      - S3_B2_EU_CEN_REGION=eu-central-2
+      - S3_B2_EU_CEN_BUCKET=b2-eu-cen
+      # Security keys
+      - ENCRYPTION_KEY=${SERVICE_PASSWORD_64_ENCRYPTION}
+      - HASH_KEY=${SERVICE_PASSWORD_64_HASH}
+      - JWT_SECRET=${SERVICE_PASSWORD_64_JWT}
+      # Admin permissions (grants first account admin access)
+      - ENTE_INTERNAL_ADMIN=1580559962386438
+      # App URLs (optional - for web interface)
+      - APPS_PUBLIC_ALBUMS=${APPS_PUBLIC_ALBUMS:-}
+      - APPS_CAST=${APPS_CAST:-}
+      - APPS_ACCOUNTS=${APPS_ACCOUNTS:-}
+    volumes:
+      - museum-data:/data
+      - museum-config:/config
+    depends_on:
+      postgres:
+        condition: service_healthy
+      minio:
+        condition: service_started
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://127.0.0.1:8080/ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  postgres:
+    image: postgres:15-alpine
+    environment:
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-ente_db}
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${SERVICE_USER_POSTGRES} -d ${POSTGRES_DB:-ente_db}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  minio:
+    image: quay.io/minio/minio:latest
+    environment:
+      - SERVICE_URL_MINIO_3200
+      - MINIO_ROOT_USER=${SERVICE_USER_MINIO}
+      - MINIO_ROOT_PASSWORD=${SERVICE_PASSWORD_MINIO}
+    command: server /data --address ":3200" --console-address ":3201"
+    volumes:
+      - minio-data:/data
+    healthcheck:
+      test: ["CMD", "mc", "ready", "local"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+
+  minio-init:
+    image: minio/mc:latest
+    depends_on:
+      minio:
+        condition: service_healthy
+    environment:
+      - MINIO_ROOT_USER=${SERVICE_USER_MINIO}
+      - MINIO_ROOT_PASSWORD=${SERVICE_PASSWORD_MINIO}
+    entrypoint: >
+      /bin/sh -c "
+      mc alias set minio http://minio:3200 $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD};
+      mc mb minio/b2-eu-cen --ignore-existing;
+      mc mb minio/wasabi-eu-central-2-v3 --ignore-existing;
+      mc mb minio/scw-eu-fr-v3 --ignore-existing;
+      echo 'MinIO buckets created successfully';
+      "
@@ -0,0 +1,103 @@
+# documentation: https://n8n.io
+# slogan: n8n is an extendable workflow automation tool with queue mode and workers.
+# category: automation
+# tags: n8n,workflow,automation,open,source,low,code,queue,worker,scalable
+# logo: svgs/n8n.png
+# port: 5678
+
+services:
+  n8n:
+    image: docker.n8n.io/n8nio/n8n
+    environment:
+      - SERVICE_URL_N8N_5678
+      - N8N_EDITOR_BASE_URL=${SERVICE_URL_N8N}
+      - WEBHOOK_URL=${SERVICE_URL_N8N}
+      - N8N_HOST=${SERVICE_URL_N8N}
+      - GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-Europe/Berlin}
+      - TZ=${TZ:-Europe/Berlin}
+      - DB_TYPE=postgresdb
+      - DB_POSTGRESDB_DATABASE=${POSTGRES_DB:-n8n}
+      - DB_POSTGRESDB_HOST=postgresql
+      - DB_POSTGRESDB_PORT=5432
+      - DB_POSTGRESDB_USER=$SERVICE_USER_POSTGRES
+      - DB_POSTGRESDB_SCHEMA=public
+      - DB_POSTGRESDB_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - EXECUTIONS_MODE=queue
+      - QUEUE_BULL_REDIS_HOST=redis
+      - QUEUE_HEALTH_CHECK_ACTIVE=true
+      - N8N_ENCRYPTION_KEY=${SERVICE_PASSWORD_ENCRYPTION}
+      - N8N_RUNNERS_ENABLED=true
+      - OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS=true
+      - N8N_BLOCK_ENV_ACCESS_IN_NODE=${N8N_BLOCK_ENV_ACCESS_IN_NODE:-true}
+      - N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=${N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS:-true}
+    volumes:
+      - n8n-data:/home/node/.n8n
+    depends_on:
+      postgresql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:5678/"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+
+  n8n-worker:
+    image: docker.n8n.io/n8nio/n8n
+    command: worker
+    environment:
+      - GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-Europe/Berlin}
+      - TZ=${TZ:-Europe/Berlin}
+      - DB_TYPE=postgresdb
+      - DB_POSTGRESDB_DATABASE=${POSTGRES_DB:-n8n}
+      - DB_POSTGRESDB_HOST=postgresql
+      - DB_POSTGRESDB_PORT=5432
+      - DB_POSTGRESDB_USER=$SERVICE_USER_POSTGRES
+      - DB_POSTGRESDB_SCHEMA=public
+      - DB_POSTGRESDB_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - EXECUTIONS_MODE=queue
+      - QUEUE_BULL_REDIS_HOST=redis
+      - QUEUE_HEALTH_CHECK_ACTIVE=true
+      - N8N_ENCRYPTION_KEY=${SERVICE_PASSWORD_ENCRYPTION}
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_BLOCK_ENV_ACCESS_IN_NODE=${N8N_BLOCK_ENV_ACCESS_IN_NODE:-true}
+      - N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=${N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS:-true}
+    volumes:
+      - n8n-data:/home/node/.n8n
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:5678/healthz"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+    depends_on:
+      n8n:
+        condition: service_healthy
+      postgresql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+
+  postgresql:
+    image: postgres:16-alpine
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DB=${POSTGRES_DB:-n8n}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+
+  redis:
+    image: redis:6-alpine
+    volumes:
+      - redis-data:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
@@ -1,3 +1,4 @@
+# ignore: true
 # documentation: https://posthog.com
 # slogan: The single platform to analyze, test, observe, and deploy new features
 # category: analytics