Merge pull request #53 from Ahson-Shaikh/28-08-2025

Removed Twenty, Updated Plane

appwrite/code/.env.example

@@ -3,11 +3,17 @@ _APP_LOCALE=en
 _APP_OPTIONS_ABUSE=enabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
 _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled
+_APP_OPTIONS_ROUTER_FORCE_HTTPS=disabled
 _APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
-_APP_DOMAIN=localhost
+_APP_DOMAIN=$(PRIMARY_DOMAIN)
+_APP_CUSTOM_DOMAIN_DENY_LIST=example.com,test.com,app.example.com
 _APP_DOMAIN_FUNCTIONS=functions.localhost
+_APP_DOMAIN_SITES=sites.localhost
 _APP_DOMAIN_TARGET=localhost
+_APP_DOMAIN_TARGET_CNAME=localhost
+_APP_DOMAIN_TARGET_AAAA=::1
+_APP_DOMAIN_TARGET_A=127.0.0.1
 _APP_CONSOLE_WHITELIST_ROOT=enabled
 _APP_CONSOLE_WHITELIST_EMAILS=
 _APP_CONSOLE_WHITELIST_IPS=
@@ -27,6 +33,8 @@ _APP_USAGE_TIMESERIES_INTERVAL=30
 _APP_USAGE_DATABASE_INTERVAL=900
 _APP_WORKER_PER_CORE=6
 _APP_CONSOLE_SESSION_ALERTS=disabled
+_APP_COMPRESSION_ENABLED=enabled
+_APP_COMPRESSION_MIN_SIZE_BYTES=1024
 _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_USER=
@@ -58,6 +66,7 @@ _APP_STORAGE_S3_ACCESS_KEY=
 _APP_STORAGE_S3_SECRET=
 _APP_STORAGE_S3_REGION=us-east-1
 _APP_STORAGE_S3_BUCKET=
+_APP_STORAGE_S3_ENDPOINT=
 _APP_STORAGE_DO_SPACES_ACCESS_KEY=
 _APP_STORAGE_DO_SPACES_SECRET=
 _APP_STORAGE_DO_SPACES_REGION=us-east-1
@@ -75,12 +84,16 @@ _APP_STORAGE_WASABI_SECRET=
 _APP_STORAGE_WASABI_REGION=eu-central-1
 _APP_STORAGE_WASABI_BUCKET=
 _APP_FUNCTIONS_SIZE_LIMIT=30000000
+_APP_COMPUTE_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_BUILD_SIZE_LIMIT=2000000000
 _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
+_APP_COMPUTE_BUILD_TIMEOUT=900
 _APP_FUNCTIONS_CONTAINERS=10
 _APP_FUNCTIONS_CPUS=0
+_APP_COMPUTE_CPUS=0
 _APP_FUNCTIONS_MEMORY=0
+_APP_COMPUTE_MEMORY=0
 _APP_FUNCTIONS_MEMORY_SWAP=0
 _APP_FUNCTIONS_RUNTIMES=node-16.0,php-8.0,python-3.9,ruby-3.0
 _APP_EXECUTOR_SECRET=your-secret-key
@@ -88,14 +101,19 @@ _APP_EXECUTOR_HOST=http://exc1/v1
 _APP_EXECUTOR_RUNTIME_NETWORK=appwrite_runtimes
 _APP_FUNCTIONS_ENVS=node-16.0,php-7.4,python-3.9,ruby-3.0
 _APP_FUNCTIONS_INACTIVE_THRESHOLD=60
+_APP_COMPUTE_INACTIVE_THRESHOLD=60
 DOCKERHUB_PULL_USERNAME=
 DOCKERHUB_PULL_PASSWORD=
 DOCKERHUB_PULL_EMAIL=
 OPEN_RUNTIMES_NETWORK=appwrite_runtimes
 _APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
+_APP_COMPUTE_RUNTIMES_NETWORK=runtimes
 _APP_DOCKER_HUB_USERNAME=
 _APP_DOCKER_HUB_PASSWORD=
 _APP_FUNCTIONS_MAINTENANCE_INTERVAL=3600
+_APP_COMPUTE_MAINTENANCE_INTERVAL=3600
+_APP_SITES_TIMEOUT=900
+_APP_SITES_RUNTIMES=static-1,node-22,flutter-3.29
 _APP_VCS_GITHUB_APP_NAME=
 _APP_VCS_GITHUB_PRIVATE_KEY=
 _APP_VCS_GITHUB_APP_ID=
@@ -104,9 +122,11 @@ _APP_VCS_GITHUB_CLIENT_SECRET=
 _APP_VCS_GITHUB_WEBHOOK_SECRET=
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_DELAY=0
+_APP_MAINTENANCE_START_TIME=00:00
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
+_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=15778800
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
 _APP_MAINTENANCE_RETENTION_SCHEDULES=86400

appwrite/code/docker-compose.yml

@@ -28,7 +28,7 @@ services:
       - appwrite
 
   appwrite:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     <<: *x-logging
     restart: unless-stopped
     networks:
@@ -49,10 +49,13 @@ services:
       - traefik.http.routers.appwrite_api_https.tls=true
     volumes:
       - appwrite-uploads:/storage/uploads:rw
+      - appwrite-imports:/storage/imports:rw
       - appwrite-cache:/storage/cache:rw
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
       - appwrite-functions:/storage/functions:rw
+      - appwrite-sites:/storage/sites:rw
+      - appwrite-builds:/storage/builds:rw
     depends_on:
       - mariadb
       - redis
@@ -61,6 +64,7 @@ services:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
       - _APP_LOCALE
+      - _APP_COMPRESSION_MIN_SIZE_BYTES
       - _APP_CONSOLE_WHITELIST_ROOT
       - _APP_CONSOLE_WHITELIST_EMAILS
       - _APP_CONSOLE_SESSION_ALERTS
@@ -73,10 +77,12 @@ services:
       - _APP_OPTIONS_ABUSE
       - _APP_OPTIONS_ROUTER_PROTECTION
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_ROUTER_FORCE_HTTPS
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET
+      - _APP_DOMAIN_TARGET_CNAME
+      - _APP_DOMAIN_TARGET_AAAA
+      - _APP_DOMAIN_TARGET_A
       - _APP_DOMAIN_FUNCTIONS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
@@ -103,6 +109,7 @@ services:
       - _APP_STORAGE_S3_SECRET
       - _APP_STORAGE_S3_REGION
       - _APP_STORAGE_S3_BUCKET
+      - _APP_STORAGE_S3_ENDPOINT
       - _APP_STORAGE_DO_SPACES_ACCESS_KEY
       - _APP_STORAGE_DO_SPACES_SECRET
       - _APP_STORAGE_DO_SPACES_REGION
@@ -119,21 +126,26 @@ services:
       - _APP_STORAGE_WASABI_SECRET
       - _APP_STORAGE_WASABI_REGION
       - _APP_STORAGE_WASABI_BUCKET
-      - _APP_FUNCTIONS_SIZE_LIMIT
+      - _APP_COMPUTE_SIZE_LIMIT
       - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_SITES_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
       - _APP_FUNCTIONS_RUNTIMES
+      - _APP_SITES_RUNTIMES
+      - _APP_DOMAIN_SITES
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_LOGGING_CONFIG
       - _APP_MAINTENANCE_INTERVAL
       - _APP_MAINTENANCE_DELAY
+      - _APP_MAINTENANCE_START_TIME
       - _APP_MAINTENANCE_RETENTION_EXECUTION
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_SMS_PROVIDER
@@ -153,7 +165,7 @@ services:
 
   appwrite-console:
     <<: *x-logging
-    image: appwrite/console:5.0.12
+    image: appwrite/console:6.0.13
     restart: unless-stopped
     networks:
       - appwrite
@@ -173,7 +185,7 @@ services:
       - traefik.http.routers.appwrite_console_https.tls=true
 
   appwrite-realtime:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: realtime
     <<: *x-logging
     restart: unless-stopped
@@ -215,7 +227,7 @@ services:
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-audits:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: worker-audits
     <<: *x-logging
     restart: unless-stopped
@@ -240,7 +252,7 @@ services:
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-webhooks:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: worker-webhooks
     <<: *x-logging
     restart: unless-stopped
@@ -267,7 +279,7 @@ services:
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-deletes:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: worker-deletes
     <<: *x-logging
     restart: unless-stopped
@@ -280,6 +292,7 @@ services:
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
       - appwrite-functions:/storage/functions:rw
+      - appwrite-sites:/storage/sites:rw
       - appwrite-builds:/storage/builds:rw
       - appwrite-certificates:/storage/certificates:rw
     environment:
@@ -300,6 +313,7 @@ services:
       - _APP_STORAGE_S3_SECRET
       - _APP_STORAGE_S3_REGION
       - _APP_STORAGE_S3_BUCKET
+      - _APP_STORAGE_S3_ENDPOINT
       - _APP_STORAGE_DO_SPACES_ACCESS_KEY
       - _APP_STORAGE_DO_SPACES_SECRET
       - _APP_STORAGE_DO_SPACES_REGION
@@ -321,10 +335,13 @@ services:
       - _APP_EXECUTOR_HOST
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_EXECUTION
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
+      - _APP_EMAIL_CERTIFICATES
 
   appwrite-worker-databases:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: worker-databases
     <<: *x-logging
     restart: unless-stopped
@@ -349,7 +366,7 @@ services:
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-builds:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: worker-builds
     <<: *x-logging
     restart: unless-stopped
@@ -360,7 +377,9 @@ services:
       - mariadb
     volumes:
       - appwrite-functions:/storage/functions:rw
+      - appwrite-sites:/storage/sites:rw
       - appwrite-builds:/storage/builds:rw
+      - appwrite-uploads:/storage/uploads:rw
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -381,18 +400,20 @@ services:
       - _APP_VCS_GITHUB_PRIVATE_KEY
       - _APP_VCS_GITHUB_APP_ID
       - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
-      - _APP_FUNCTIONS_SIZE_LIMIT
+      - _APP_SITES_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_ROUTER_FORCE_HTTPS
       - _APP_DOMAIN
       - _APP_STORAGE_DEVICE
       - _APP_STORAGE_S3_ACCESS_KEY
       - _APP_STORAGE_S3_SECRET
       - _APP_STORAGE_S3_REGION
       - _APP_STORAGE_S3_BUCKET
+      - _APP_STORAGE_S3_ENDPOINT
       - _APP_STORAGE_DO_SPACES_ACCESS_KEY
       - _APP_STORAGE_DO_SPACES_SECRET
       - _APP_STORAGE_DO_SPACES_REGION
@@ -409,9 +430,10 @@ services:
       - _APP_STORAGE_WASABI_SECRET
       - _APP_STORAGE_WASABI_REGION
       - _APP_STORAGE_WASABI_BUCKET
+      - _APP_DOMAIN_SITES
 
   appwrite-worker-certificates:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: worker-certificates
     <<: *x-logging
     restart: unless-stopped
@@ -428,7 +450,9 @@ services:
       - _APP_WORKER_PER_CORE
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET
+      - _APP_DOMAIN_TARGET_CNAME
+      - _APP_DOMAIN_TARGET_AAAA
+      - _APP_DOMAIN_TARGET_A
       - _APP_DOMAIN_FUNCTIONS
       - _APP_EMAIL_CERTIFICATES
       - _APP_REDIS_HOST
@@ -443,7 +467,7 @@ services:
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-functions:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: worker-functions
     <<: *x-logging
     restart: unless-stopped
@@ -469,9 +493,10 @@ services:
       - _APP_DB_USER
       - _APP_DB_PASS
       - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_SITES_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_USAGE_STATS
@@ -480,7 +505,7 @@ services:
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-mails:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: worker-mails
     <<: *x-logging
     restart: unless-stopped
@@ -509,9 +534,11 @@ services:
       - _APP_SMTP_USERNAME
       - _APP_SMTP_PASSWORD
       - _APP_LOGGING_CONFIG
+      - _APP_DOMAIN
+      - _APP_OPTIONS_FORCE_HTTPS
 
   appwrite-worker-messaging:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: worker-messaging
     <<: *x-logging
     restart: unless-stopped
@@ -542,6 +569,7 @@ services:
       - _APP_STORAGE_S3_SECRET
       - _APP_STORAGE_S3_REGION
       - _APP_STORAGE_S3_BUCKET
+      - _APP_STORAGE_S3_ENDPOINT
       - _APP_STORAGE_DO_SPACES_ACCESS_KEY
       - _APP_STORAGE_DO_SPACES_SECRET
       - _APP_STORAGE_DO_SPACES_REGION
@@ -560,12 +588,14 @@ services:
       - _APP_STORAGE_WASABI_BUCKET
 
   appwrite-worker-migrations:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: worker-migrations
     <<: *x-logging
     restart: unless-stopped
     networks:
       - appwrite
+    volumes:
+      - appwrite-imports:/storage/imports:rw
     depends_on:
       - mariadb
     environment:
@@ -573,7 +603,9 @@ services:
       - _APP_WORKER_PER_CORE
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET
+      - _APP_DOMAIN_TARGET_CNAME
+      - _APP_DOMAIN_TARGET_AAAA
+      - _APP_DOMAIN_TARGET_A
       - _APP_EMAIL_SECURITY
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
@@ -589,7 +621,7 @@ services:
       - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
 
   appwrite-task-maintenance:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: maintenance
     <<: *x-logging
     restart: unless-stopped
@@ -601,7 +633,9 @@ services:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET
+      - _APP_DOMAIN_TARGET_CNAME
+      - _APP_DOMAIN_TARGET_AAAA
+      - _APP_DOMAIN_TARGET_A
       - _APP_DOMAIN_FUNCTIONS
       - _APP_OPENSSL_KEY_V1
       - _APP_REDIS_HOST
@@ -618,12 +652,13 @@ services:
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
 
-  appwrite-worker-usage:
-    image: appwrite/appwrite:1.6.0
-    entrypoint: worker-usage
+  appwrite-task-stats-resources:
+    image: appwrite/appwrite:1.7.4
+    entrypoint: stats-resources
     <<: *x-logging
     restart: unless-stopped
     networks:
@@ -646,12 +681,41 @@ services:
       - _APP_REDIS_PASS
       - _APP_USAGE_STATS
       - _APP_LOGGING_CONFIG
-      - _APP_USAGE_AGGREGATION_INTERVAL
+      - _APP_DATABASE_SHARED_TABLES
+      - _APP_STATS_RESOURCES_INTERVAL
 
-  appwrite-worker-usage-dump:
-    image: appwrite/appwrite:1.6.0
-    entrypoint: worker-usage-dump
+  appwrite-worker-stats-resources:
+    image: appwrite/appwrite:1.7.4
+    entrypoint: worker-stats-resources
     <<: *x-logging
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_USAGE_STATS
+      - _APP_LOGGING_CONFIG
+      - _APP_STATS_RESOURCES_INTERVAL
+
+  appwrite-worker-stats-usage:
+    image: appwrite/appwrite:1.7.4
+    entrypoint: worker-stats-usage
+    <<: *x-logging
+    restart: unless-stopped
     networks:
       - appwrite
     depends_on:
@@ -675,7 +739,7 @@ services:
       - _APP_USAGE_AGGREGATION_INTERVAL
 
   appwrite-task-scheduler-functions:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: schedule-functions
     <<: *x-logging
     restart: unless-stopped
@@ -699,7 +763,7 @@ services:
       - _APP_DB_PASS
 
   appwrite-task-scheduler-executions:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: schedule-executions
     <<: *x-logging
     restart: unless-stopped
@@ -723,7 +787,7 @@ services:
       - _APP_DB_PASS
 
   appwrite-task-scheduler-messages:
-    image: appwrite/appwrite:1.6.0
+    image: appwrite/appwrite:1.7.4
     entrypoint: schedule-messages
     <<: *x-logging
     restart: unless-stopped
@@ -755,12 +819,19 @@ services:
     environment:
       - _APP_ASSISTANT_OPENAI_API_KEY
 
+  appwrite-browser:
+    image: appwrite/browser:0.2.4
+    <<: *x-logging
+    restart: unless-stopped
+    networks:
+      - appwrite
+
   openruntimes-executor:
     hostname: exc1
     <<: *x-logging
     restart: unless-stopped
     stop_signal: SIGINT
-    image: openruntimes/executor:0.6.11
+    image: openruntimes/executor:0.7.14
     networks:
       - appwrite
       - runtimes
@@ -768,24 +839,27 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - appwrite-builds:/storage/builds:rw
       - appwrite-functions:/storage/functions:rw
+      - appwrite-sites:/storage/sites: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
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
       - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
       - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
       - OPR_EXECUTOR_ENV=$_APP_ENV
-      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES,$_APP_SITES_RUNTIMES
       - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
+      - OPR_EXECUTOR_RUNTIME_VERSIONS=v5
       - 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
       - OPR_EXECUTOR_STORAGE_S3_SECRET=$_APP_STORAGE_S3_SECRET
       - OPR_EXECUTOR_STORAGE_S3_REGION=$_APP_STORAGE_S3_REGION
       - OPR_EXECUTOR_STORAGE_S3_BUCKET=$_APP_STORAGE_S3_BUCKET
+      - OPR_EXECUTOR_STORAGE_S3_ENDPOINT=$_APP_STORAGE_S3_ENDPOINT
       - OPR_EXECUTOR_STORAGE_DO_SPACES_ACCESS_KEY=$_APP_STORAGE_DO_SPACES_ACCESS_KEY
       - OPR_EXECUTOR_STORAGE_DO_SPACES_SECRET=$_APP_STORAGE_DO_SPACES_SECRET
       - OPR_EXECUTOR_STORAGE_DO_SPACES_REGION=$_APP_STORAGE_DO_SPACES_REGION
@@ -852,7 +926,9 @@ volumes:
   appwrite-redis:
   appwrite-cache:
   appwrite-uploads:
+  appwrite-imports:
   appwrite-certificates:
   appwrite-functions:
+  appwrite-sites:
   appwrite-builds:
   appwrite-config:

appwrite/update.js

@@ -11,3 +11,9 @@ await utils.downloadFile(
 
 await utils.removeContainerNames("./code/docker-compose.yml");
 await utils.removePorts("./code/docker-compose.yml");
+
+await utils.searchReplace(
+  "./code/.env.example",
+  "_APP_DOMAIN=localhost",
+  "_APP_DOMAIN=$(PRIMARY_DOMAIN)"
+);

appwrite/update.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if [ ! -d "./repo" ]; then
-    git clone --depth 1 --branch main --single-branch https://github.com/appwrite/appwrite.git repo
-else
-    cd repo
-    git pull
-    cd ..
-fi
-
-curl -s https://appwrite.io/install/compose > ./code/docker-compose.yml
-curl -s https://appwrite.io/install/env > ./code/.env.example
-
-

dify/code/.env.example

@@ -34,13 +34,29 @@ APP_API_URL=
 # used to display WebAPP API Base Url to the front-end.
 # If empty, it is the same domain.
 # Example: https://app.dify.ai
-APP_WEB_URL=
+APP_WEB_URL=https://$(PRIMARY_DOMAIN)
 
 # File preview or download Url prefix.
 # used to display File preview or download Url to the front-end or as Multi-model inputs;
 # Url is signed and has expiration time.
+# Setting FILES_URL is required for file processing plugins.
+#   - For https://example.com, use FILES_URL=https://example.com
+#   - For http://example.com, use FILES_URL=http://example.com
+#   Recommendation: use a dedicated domain (e.g., https://upload.example.com).
+#   Alternatively, use http://<your-ip>:5001 or http://api:5001,
+#   ensuring port 5001 is externally accessible (see docker-compose.yaml).
 FILES_URL=
 
+# INTERNAL_FILES_URL is used for plugin daemon communication within Docker network.
+# Set this to the internal Docker service URL for proper plugin file access.
+# Example: INTERNAL_FILES_URL=http://api:5001
+INTERNAL_FILES_URL=
+
+# Ensure UTF-8 encoding
+LANG=en_US.UTF-8
+LC_ALL=en_US.UTF-8
+PYTHONIOENCODING=utf-8
+
 # ------------------------------
 # Server Configuration
 # ------------------------------
@@ -68,15 +84,19 @@ DEBUG=false
 # which is convenient for debugging.
 FLASK_DEBUG=false
 
-# A secretkey that is used for securely signing the session cookie
+# Enable request logging, which will log the request and response information.
+# And the log level is DEBUG
+ENABLE_REQUEST_LOGGING=False
+
+# A secret key that is used for securely signing the session cookie
 # and encrypting sensitive information on the database.
 # You can generate a strong key using `openssl rand -base64 42`.
-SECRET_KEY=sk-9f73s3ljTXVcMT3Blb3ljTqtsKiGHXVcMT3BlbkFJLK7U
+SECRET_KEY=
 
 # Password for admin user initialization.
 # If left unset, admin user will not be prompted for a password
-# when creating the initial admin account. 
-# The length of the password cannot exceed 30 charactors.
+# when creating the initial admin account.
+# The length of the password cannot exceed 30 characters.
 INIT_PASSWORD=
 
 # Deployment environment.
@@ -174,6 +194,12 @@ CELERY_MIN_WORKERS=
 API_TOOL_DEFAULT_CONNECT_TIMEOUT=10
 API_TOOL_DEFAULT_READ_TIMEOUT=60
 
+# -------------------------------
+# Datasource Configuration
+# --------------------------------
+ENABLE_WEBSITE_JINAREADER=true
+ENABLE_WEBSITE_FIRECRAWL=true
+ENABLE_WEBSITE_WATERCRAWL=true
 
 # ------------------------------
 # Database Configuration
@@ -189,10 +215,16 @@ DB_DATABASE=dify
 # The size of the database connection pool.
 # The default is 30 connections, which can be appropriately increased.
 SQLALCHEMY_POOL_SIZE=30
+# The default is 10 connections, which allows temporary overflow beyond the pool size.
+SQLALCHEMY_MAX_OVERFLOW=10
 # Database connection pool recycling time, the default is 3600 seconds.
 SQLALCHEMY_POOL_RECYCLE=3600
 # Whether to print SQL, default is false.
 SQLALCHEMY_ECHO=false
+# If True, will test connections for liveness upon each checkout
+SQLALCHEMY_POOL_PRE_PING=false
+# Whether to enable the Last in first out option or use default FIFO queue if is false
+SQLALCHEMY_POOL_USE_LIFO=false
 
 # Maximum number of connections to the database
 # Default is 100
@@ -234,6 +266,15 @@ REDIS_PORT=6379
 REDIS_USERNAME=
 REDIS_PASSWORD=difyai123456
 REDIS_USE_SSL=false
+# SSL configuration for Redis (when REDIS_USE_SSL=true)
+REDIS_SSL_CERT_REQS=CERT_NONE
+# Options: CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED
+REDIS_SSL_CA_CERTS=
+# Path to CA certificate file for SSL verification
+REDIS_SSL_CERTFILE=
+# Path to client certificate file for SSL authentication
+REDIS_SSL_KEYFILE=
+# Path to client private key file for SSL authentication
 REDIS_DB=0
 
 # Whether to use Redis Sentinel mode.
@@ -258,17 +299,20 @@ REDIS_CLUSTERS_PASSWORD=
 # Celery Configuration
 # ------------------------------
 
-# Use redis as the broker, and redis db 1 for celery broker.
-# Format as follows: `redis://<redis_username>:<redis_password>@<redis_host>:<redis_port>/<redis_database>`
+# Use standalone redis as the broker, and redis db 1 for celery broker. (redis_username is usually set by defualt as empty)
+# Format as follows: `redis://<redis_username>:<redis_password>@<redis_host>:<redis_port>/<redis_database>`.
 # Example: redis://:difyai123456@redis:6379/1
-# If use Redis Sentinel, format as follows: `sentinel://<sentinel_username>:<sentinel_password>@<sentinel_host>:<sentinel_port>/<redis_database>`
-# Example: sentinel://localhost:26379/1;sentinel://localhost:26380/1;sentinel://localhost:26381/1
+# If use Redis Sentinel, format as follows: `sentinel://<redis_username>:<redis_password>@<sentinel_host1>:<sentinel_port>/<redis_database>`
+# For high availability, you can configure multiple Sentinel nodes (if provided) separated by semicolons like below example:
+# Example: sentinel://:difyai123456@localhost:26379/1;sentinel://:difyai12345@localhost:26379/1;sentinel://:difyai12345@localhost:26379/1
 CELERY_BROKER_URL=redis://:difyai123456@redis:6379/1
+CELERY_BACKEND=redis
 BROKER_USE_SSL=false
 
 # If you are using Redis Sentinel for high availability, configure the following settings.
 CELERY_USE_SENTINEL=false
 CELERY_SENTINEL_MASTER_NAME=
+CELERY_SENTINEL_PASSWORD=
 CELERY_SENTINEL_SOCKET_TIMEOUT=0.1
 
 # ------------------------------
@@ -300,6 +344,25 @@ OPENDAL_SCHEME=fs
 # Configurations for OpenDAL Local File System.
 OPENDAL_FS_ROOT=storage
 
+# ClickZetta Volume Configuration (for storage backend)
+# To use ClickZetta Volume as storage backend, set STORAGE_TYPE=clickzetta-volume
+# Note: ClickZetta Volume will reuse the existing CLICKZETTA_* connection parameters
+
+# Volume type selection (three types available):
+# - user: Personal/small team use, simple config, user-level permissions
+# - table: Enterprise multi-tenant, smart routing, table-level + user-level permissions
+# - external: Data lake integration, external storage connection, volume-level + storage-level permissions
+CLICKZETTA_VOLUME_TYPE=user
+
+# External Volume name (required only when TYPE=external)
+CLICKZETTA_VOLUME_NAME=
+
+# Table Volume table prefix (used only when TYPE=table)
+CLICKZETTA_VOLUME_TABLE_PREFIX=dataset_
+
+# Dify file directory prefix (isolates from other apps, recommended to keep default)
+CLICKZETTA_VOLUME_DIFY_PREFIX=dify_km
+
 # S3 Configuration
 #
 S3_ENDPOINT=
@@ -344,7 +407,7 @@ TENCENT_COS_SCHEME=your-scheme
 
 # Oracle Storage Configuration
 #
-OCI_ENDPOINT=https://objectstorage.us-ashburn-1.oraclecloud.com
+OCI_ENDPOINT=https://your-object-storage-namespace.compat.objectstorage.us-ashburn-1.oraclecloud.com
 OCI_BUCKET_NAME=your-bucket-name
 OCI_ACCESS_KEY=your-access-key
 OCI_SECRET_KEY=your-secret-key
@@ -383,8 +446,10 @@ SUPABASE_URL=your-server-url
 # ------------------------------
 
 # The type of vector store to use.
-# Supported values are `weaviate`, `qdrant`, `milvus`, `myscale`, `relyt`, `pgvector`, `pgvecto-rs`, `chroma`, `opensearch`, `tidb_vector`, `oracle`, `tencent`, `elasticsearch`, `elasticsearch-ja`, `analyticdb`, `couchbase`, `vikingdb`, `oceanbase`.
+# Supported values are `weaviate`, `qdrant`, `milvus`, `myscale`, `relyt`, `pgvector`, `pgvecto-rs`, `chroma`, `opensearch`, `oracle`, `tencent`, `elasticsearch`, `elasticsearch-ja`, `analyticdb`, `couchbase`, `vikingdb`, `oceanbase`, `opengauss`, `tablestore`,`vastbase`,`tidb`,`tidb_on_qdrant`,`baidu`,`lindorm`,`huawei_cloud`,`upstash`, `matrixone`, `clickzetta`.
 VECTOR_STORE=weaviate
+# Prefix used to create collection name in vector database
+VECTOR_INDEX_NAME_PREFIX=Vector_index
 
 # The Weaviate endpoint URL. Only available when VECTOR_STORE is `weaviate`.
 WEAVIATE_ENDPOINT=http://weaviate:8080
@@ -396,14 +461,17 @@ QDRANT_API_KEY=difyai123456
 QDRANT_CLIENT_TIMEOUT=20
 QDRANT_GRPC_ENABLED=false
 QDRANT_GRPC_PORT=6334
+QDRANT_REPLICATION_FACTOR=1
 
-# Milvus configuration Only available when VECTOR_STORE is `milvus`.
+# Milvus configuration. Only available when VECTOR_STORE is `milvus`.
 # The milvus uri.
-MILVUS_URI=http://127.0.0.1:19530
+MILVUS_URI=http://host.docker.internal:19530
+MILVUS_DATABASE=
 MILVUS_TOKEN=
-MILVUS_USER=root
-MILVUS_PASSWORD=Milvus
+MILVUS_USER=
+MILVUS_PASSWORD=
 MILVUS_ENABLE_HYBRID_SEARCH=False
+MILVUS_ANALYZER_PARAMS=
 
 # MyScale configuration, only available when VECTOR_STORE is `myscale`
 # For multi-language support, please set MYSCALE_FTS_PARAMS with referring to:
@@ -431,6 +499,17 @@ PGVECTOR_PASSWORD=difyai123456
 PGVECTOR_DATABASE=dify
 PGVECTOR_MIN_CONNECTION=1
 PGVECTOR_MAX_CONNECTION=5
+PGVECTOR_PG_BIGM=false
+PGVECTOR_PG_BIGM_VERSION=1.2-20240606
+
+# vastbase configurations, only available when VECTOR_STORE is `vastbase`
+VASTBASE_HOST=vastbase
+VASTBASE_PORT=5432
+VASTBASE_USER=dify
+VASTBASE_PASSWORD=Difyai123456
+VASTBASE_DATABASE=dify
+VASTBASE_MIN_CONNECTION=1
+VASTBASE_MAX_CONNECTION=5
 
 # pgvecto-rs configurations, only available when VECTOR_STORE is `pgvecto-rs`
 PGVECTO_RS_HOST=pgvecto-rs
@@ -453,13 +532,20 @@ ANALYTICDB_PORT=5432
 ANALYTICDB_MIN_CONNECTION=1
 ANALYTICDB_MAX_CONNECTION=5
 
-# TiDB vector configurations, only available when VECTOR_STORE is `tidb`
+# TiDB vector configurations, only available when VECTOR_STORE is `tidb_vector`
 TIDB_VECTOR_HOST=tidb
 TIDB_VECTOR_PORT=4000
 TIDB_VECTOR_USER=
 TIDB_VECTOR_PASSWORD=
 TIDB_VECTOR_DATABASE=dify
 
+# Matrixone vector configurations.
+MATRIXONE_HOST=matrixone
+MATRIXONE_PORT=6001
+MATRIXONE_USER=dump
+MATRIXONE_PASSWORD=111
+MATRIXONE_DATABASE=dify
+
 # Tidb on qdrant configuration, only available when VECTOR_STORE is `tidb_on_qdrant`
 TIDB_ON_QDRANT_URL=http://127.0.0.1
 TIDB_ON_QDRANT_API_KEY=dify
@@ -483,11 +569,13 @@ CHROMA_AUTH_PROVIDER=chromadb.auth.token_authn.TokenAuthClientProvider
 CHROMA_AUTH_CREDENTIALS=
 
 # Oracle configuration, only available when VECTOR_STORE is `oracle`
-ORACLE_HOST=oracle
-ORACLE_PORT=1521
 ORACLE_USER=dify
 ORACLE_PASSWORD=dify
-ORACLE_DATABASE=FREEPDB1
+ORACLE_DSN=oracle:1521/FREEPDB1
+ORACLE_CONFIG_DIR=/app/api/storage/wallet
+ORACLE_WALLET_LOCATION=/app/api/storage/wallet
+ORACLE_WALLET_PASSWORD=dify
+ORACLE_IS_AUTONOMOUS=false
 
 # relyt configurations, only available when VECTOR_STORE is `relyt`
 RELYT_HOST=db
@@ -499,9 +587,14 @@ RELYT_DATABASE=postgres
 # open search configuration, only available when VECTOR_STORE is `opensearch`
 OPENSEARCH_HOST=opensearch
 OPENSEARCH_PORT=9200
+OPENSEARCH_SECURE=true
+OPENSEARCH_VERIFY_CERTS=true
+OPENSEARCH_AUTH_METHOD=basic
 OPENSEARCH_USER=admin
 OPENSEARCH_PASSWORD=admin
-OPENSEARCH_SECURE=true
+# If using AWS managed IAM, e.g. Managed Cluster or OpenSearch Serverless
+OPENSEARCH_AWS_REGION=ap-southeast-1
+OPENSEARCH_AWS_SERVICE=aoss
 
 # tencent vector configurations, only available when VECTOR_STORE is `tencent`
 TENCENT_VECTOR_DB_URL=http://127.0.0.1
@@ -511,6 +604,7 @@ TENCENT_VECTOR_DB_USERNAME=dify
 TENCENT_VECTOR_DB_DATABASE=dify
 TENCENT_VECTOR_DB_SHARD=1
 TENCENT_VECTOR_DB_REPLICAS=2
+TENCENT_VECTOR_DB_ENABLE_HYBRID_SEARCH=false
 
 # ElasticSearch configuration, only available when VECTOR_STORE is `elasticsearch`
 ELASTICSEARCH_HOST=0.0.0.0
@@ -519,6 +613,17 @@ ELASTICSEARCH_USERNAME=elastic
 ELASTICSEARCH_PASSWORD=elastic
 KIBANA_PORT=5601
 
+# Using ElasticSearch Cloud Serverless, or not.
+ELASTICSEARCH_USE_CLOUD=false
+ELASTICSEARCH_CLOUD_URL=YOUR-ELASTICSEARCH_CLOUD_URL
+ELASTICSEARCH_API_KEY=YOUR-ELASTICSEARCH_API_KEY
+
+ELASTICSEARCH_VERIFY_CERTS=False
+ELASTICSEARCH_CA_CERTS=
+ELASTICSEARCH_REQUEST_TIMEOUT=100000
+ELASTICSEARCH_RETRY_ON_TIMEOUT=True
+ELASTICSEARCH_MAX_RETRIES=10
+
 # baidu vector configurations, only available when VECTOR_STORE is `baidu`
 BAIDU_VECTOR_DB_ENDPOINT=http://127.0.0.1:5287
 BAIDU_VECTOR_DB_CONNECTION_TIMEOUT_MS=30000
@@ -541,6 +646,7 @@ VIKINGDB_SOCKET_TIMEOUT=30
 LINDORM_URL=http://lindorm:30070
 LINDORM_USERNAME=lindorm
 LINDORM_PASSWORD=lindorm
+LINDORM_QUERY_TIMEOUT=1
 
 # OceanBase Vector configuration, only available when VECTOR_STORE is `oceanbase`
 OCEANBASE_VECTOR_HOST=oceanbase
@@ -550,11 +656,49 @@ OCEANBASE_VECTOR_PASSWORD=difyai123456
 OCEANBASE_VECTOR_DATABASE=test
 OCEANBASE_CLUSTER_NAME=difyai
 OCEANBASE_MEMORY_LIMIT=6G
+OCEANBASE_ENABLE_HYBRID_SEARCH=false
+
+# opengauss configurations, only available when VECTOR_STORE is `opengauss`
+OPENGAUSS_HOST=opengauss
+OPENGAUSS_PORT=6600
+OPENGAUSS_USER=postgres
+OPENGAUSS_PASSWORD=Dify@123
+OPENGAUSS_DATABASE=dify
+OPENGAUSS_MIN_CONNECTION=1
+OPENGAUSS_MAX_CONNECTION=5
+OPENGAUSS_ENABLE_PQ=false
+
+# huawei cloud search service vector configurations, only available when VECTOR_STORE is `huawei_cloud`
+HUAWEI_CLOUD_HOSTS=https://127.0.0.1:9200
+HUAWEI_CLOUD_USER=admin
+HUAWEI_CLOUD_PASSWORD=admin
 
 # Upstash Vector configuration, only available when VECTOR_STORE is `upstash`
 UPSTASH_VECTOR_URL=https://xxx-vector.upstash.io
 UPSTASH_VECTOR_TOKEN=dify
 
+# TableStore Vector configuration
+# (only used when VECTOR_STORE is tablestore)
+TABLESTORE_ENDPOINT=https://instance-name.cn-hangzhou.ots.aliyuncs.com
+TABLESTORE_INSTANCE_NAME=instance-name
+TABLESTORE_ACCESS_KEY_ID=xxx
+TABLESTORE_ACCESS_KEY_SECRET=xxx
+TABLESTORE_NORMALIZE_FULLTEXT_BM25_SCORE=false
+
+# Clickzetta configuration, only available when VECTOR_STORE is `clickzetta`
+CLICKZETTA_USERNAME=
+CLICKZETTA_PASSWORD=
+CLICKZETTA_INSTANCE=
+CLICKZETTA_SERVICE=api.clickzetta.com
+CLICKZETTA_WORKSPACE=quick_start
+CLICKZETTA_VCLUSTER=default_ap
+CLICKZETTA_SCHEMA=dify
+CLICKZETTA_BATCH_SIZE=100
+CLICKZETTA_ENABLE_INVERTED_INDEX=true
+CLICKZETTA_ANALYZER_TYPE=chinese
+CLICKZETTA_ANALYZER_MODE=smart
+CLICKZETTA_VECTOR_DISTANCE_FUNCTION=cosine_distance
+
 # ------------------------------
 # Knowledge Configuration
 # ------------------------------
@@ -582,17 +726,22 @@ SCARF_NO_ANALYTICS=true
 # ------------------------------
 
 # The maximum number of tokens allowed for prompt generation.
-# This setting controls the upper limit of tokens that can be used by the LLM 
+# This setting controls the upper limit of tokens that can be used by the LLM
 # when generating a prompt in the prompt generation tool.
 # Default: 512 tokens.
 PROMPT_GENERATION_MAX_TOKENS=512
 
 # The maximum number of tokens allowed for code generation.
-# This setting controls the upper limit of tokens that can be used by the LLM 
+# This setting controls the upper limit of tokens that can be used by the LLM
 # when generating code in the code generation tool.
 # Default: 1024 tokens.
 CODE_GENERATION_MAX_TOKENS=1024
 
+# Enable or disable plugin based token counting. If disabled, token counting will return 0.
+# This can improve performance by skipping token counting operations.
+# Default: false (disabled).
+PLUGIN_BASED_TOKEN_COUNTING_ENABLED=false
+
 # ------------------------------
 # Multi-modal Configuration
 # ------------------------------
@@ -630,6 +779,12 @@ API_SENTRY_PROFILES_SAMPLE_RATE=1.0
 # If not set, Sentry error reporting will be disabled.
 WEB_SENTRY_DSN=
 
+# Plugin_daemon Service Sentry DSN address, default is empty, when empty,
+# all monitoring information is not reported to Sentry.
+# If not set, Sentry error reporting will be disabled.
+PLUGIN_SENTRY_ENABLED=false
+PLUGIN_SENTRY_DSN=
+
 # ------------------------------
 # Notion Integration Configuration
 # Variables can be obtained by applying for Notion integration: https://www.notion.so/my-integrations
@@ -652,10 +807,11 @@ NOTION_INTERNAL_SECRET=
 # Mail related configuration
 # ------------------------------
 
-# Mail type, support: resend, smtp
+# Mail type, support: resend, smtp, sendgrid
 MAIL_TYPE=resend
 
 # Default send from email address, if not specified
+# If using SendGrid, use the 'from' field for authentication if necessary.
 MAIL_DEFAULT_SEND_FROM=
 
 # API-Key for the Resend email provider, used when MAIL_TYPE is `resend`.
@@ -671,6 +827,9 @@ SMTP_PASSWORD=
 SMTP_USE_TLS=true
 SMTP_OPPORTUNISTIC_TLS=false
 
+# Sendgid configuration
+SENDGRID_API_KEY=
+
 # ------------------------------
 # Others Configuration
 # ------------------------------
@@ -684,6 +843,8 @@ INVITE_EXPIRY_HOURS=72
 
 # Reset password token valid time (minutes),
 RESET_PASSWORD_TOKEN_EXPIRY_MINUTES=5
+CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES=5
+OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES=5
 
 # The sandbox service endpoint.
 CODE_EXECUTION_ENDPOINT=http://sandbox:8194
@@ -709,15 +870,64 @@ MAX_VARIABLE_SIZE=204800
 WORKFLOW_PARALLEL_DEPTH_LIMIT=3
 WORKFLOW_FILE_UPLOAD_LIMIT=10
 
+# Workflow storage configuration
+# Options: rdbms, hybrid
+# rdbms: Use only the relational database (default)
+# hybrid: Save new data to object storage, read from both object storage and RDBMS
+WORKFLOW_NODE_EXECUTION_STORAGE=rdbms
+
+# Repository configuration
+# Core workflow execution repository implementation
+# Options:
+#   - core.repositories.sqlalchemy_workflow_execution_repository.SQLAlchemyWorkflowExecutionRepository (default)
+#   - core.repositories.celery_workflow_execution_repository.CeleryWorkflowExecutionRepository
+CORE_WORKFLOW_EXECUTION_REPOSITORY=core.repositories.sqlalchemy_workflow_execution_repository.SQLAlchemyWorkflowExecutionRepository
+
+# Core workflow node execution repository implementation
+# Options:
+#   - core.repositories.sqlalchemy_workflow_node_execution_repository.SQLAlchemyWorkflowNodeExecutionRepository (default)
+#   - core.repositories.celery_workflow_node_execution_repository.CeleryWorkflowNodeExecutionRepository
+CORE_WORKFLOW_NODE_EXECUTION_REPOSITORY=core.repositories.sqlalchemy_workflow_node_execution_repository.SQLAlchemyWorkflowNodeExecutionRepository
+
+# API workflow run repository implementation
+API_WORKFLOW_RUN_REPOSITORY=repositories.sqlalchemy_api_workflow_run_repository.DifyAPISQLAlchemyWorkflowRunRepository
+
+# API workflow node execution repository implementation
+API_WORKFLOW_NODE_EXECUTION_REPOSITORY=repositories.sqlalchemy_api_workflow_node_execution_repository.DifyAPISQLAlchemyWorkflowNodeExecutionRepository
+
+# Workflow log cleanup configuration
+# Enable automatic cleanup of workflow run logs to manage database size
+WORKFLOW_LOG_CLEANUP_ENABLED=false
+# Number of days to retain workflow run logs (default: 30 days)
+WORKFLOW_LOG_RETENTION_DAYS=30
+# Batch size for workflow log cleanup operations (default: 100)
+WORKFLOW_LOG_CLEANUP_BATCH_SIZE=100
+
 # HTTP request node in workflow configuration
 HTTP_REQUEST_NODE_MAX_BINARY_SIZE=10485760
 HTTP_REQUEST_NODE_MAX_TEXT_SIZE=1048576
+HTTP_REQUEST_NODE_SSL_VERIFY=True
+
+# Respect X-* headers to redirect clients
+RESPECT_XFORWARD_HEADERS_ENABLED=false
 
 # SSRF Proxy server HTTP URL
 SSRF_PROXY_HTTP_URL=http://ssrf_proxy:3128
 # SSRF Proxy server HTTPS URL
 SSRF_PROXY_HTTPS_URL=http://ssrf_proxy:3128
 
+# Maximum loop count in the workflow
+LOOP_NODE_MAX_COUNT=100
+
+# The maximum number of tools that can be used in the agent.
+MAX_TOOLS_NUM=10
+
+# Maximum number of Parallelism branches in the workflow
+MAX_PARALLEL_LIMIT=10
+
+# The maximum number of iterations for agent setting
+MAX_ITERATIONS_NUM=99
+
 # ------------------------------
 # Environment Variables for web Service
 # ------------------------------
@@ -725,11 +935,18 @@ SSRF_PROXY_HTTPS_URL=http://ssrf_proxy:3128
 # The timeout for the text generation in millisecond
 TEXT_GENERATION_TIMEOUT_MS=60000
 
+# Allow rendering unsafe URLs which have "data:" scheme.
+ALLOW_UNSAFE_DATA_SCHEME=false
+
+# Maximum number of tree depth in the workflow
+MAX_TREE_DEPTH=50
+
 # ------------------------------
 # Environment Variables for db Service
 # ------------------------------
 
-PGUSER=${DB_USERNAME}
+# The name of the default postgres user.
+POSTGRES_USER=${DB_USERNAME}
 # The password for the default postgres user.
 POSTGRES_PASSWORD=${DB_PASSWORD}
 # The name of the default postgres database.
@@ -785,7 +1002,7 @@ CHROMA_IS_PERSISTENT=TRUE
 
 # ------------------------------
 # Environment Variables for Oracle Service
-# (only used when VECTOR_STORE is Oracle)
+# (only used when VECTOR_STORE is oracle)
 # ------------------------------
 ORACLE_PWD=Dify123456
 ORACLE_CHARACTERSET=AL32UTF8
@@ -856,7 +1073,7 @@ NGINX_SSL_PROTOCOLS=TLSv1.1 TLSv1.2 TLSv1.3
 
 # Nginx performance tuning
 NGINX_WORKER_PROCESSES=auto
-NGINX_CLIENT_MAX_BODY_SIZE=15M
+NGINX_CLIENT_MAX_BODY_SIZE=100M
 NGINX_KEEPALIVE_TIMEOUT=65
 
 # Proxy settings
@@ -887,6 +1104,10 @@ SSRF_HTTP_PORT=3128
 SSRF_COREDUMP_DIR=/var/spool/squid
 SSRF_REVERSE_PROXY_PORT=8194
 SSRF_SANDBOX_HOST=sandbox
+SSRF_DEFAULT_TIME_OUT=5
+SSRF_DEFAULT_CONNECT_TIME_OUT=5
+SSRF_DEFAULT_READ_TIME_OUT=5
+SSRF_DEFAULT_WRITE_TIME_OUT=5
 
 # ------------------------------
 # docker env var for specifying vector db type at startup
@@ -932,3 +1153,119 @@ MAX_SUBMIT_COUNT=100
 
 # The maximum number of top-k value for RAG.
 TOP_K_MAX_VALUE=10
+
+# ------------------------------
+# Plugin Daemon Configuration
+# ------------------------------
+
+DB_PLUGIN_DATABASE=dify_plugin
+EXPOSE_PLUGIN_DAEMON_PORT=5002
+PLUGIN_DAEMON_PORT=5002
+PLUGIN_DAEMON_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi
+PLUGIN_DAEMON_URL=http://plugin_daemon:5002
+PLUGIN_MAX_PACKAGE_SIZE=52428800
+PLUGIN_PPROF_ENABLED=false
+
+PLUGIN_DEBUGGING_HOST=0.0.0.0
+PLUGIN_DEBUGGING_PORT=5003
+EXPOSE_PLUGIN_DEBUGGING_HOST=localhost
+EXPOSE_PLUGIN_DEBUGGING_PORT=5003
+
+# If this key is changed, DIFY_INNER_API_KEY in plugin_daemon service must also be updated or agent node will fail.
+PLUGIN_DIFY_INNER_API_KEY=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1
+PLUGIN_DIFY_INNER_API_URL=http://api:5001
+
+ENDPOINT_URL_TEMPLATE=http://localhost/e/{hook_id}
+
+MARKETPLACE_ENABLED=true
+MARKETPLACE_API_URL=https://marketplace.dify.ai
+
+FORCE_VERIFYING_SIGNATURE=true
+
+PLUGIN_STDIO_BUFFER_SIZE=1024
+PLUGIN_STDIO_MAX_BUFFER_SIZE=5242880
+
+PLUGIN_PYTHON_ENV_INIT_TIMEOUT=120
+PLUGIN_MAX_EXECUTION_TIMEOUT=600
+# PIP_MIRROR_URL=https://pypi.tuna.tsinghua.edu.cn/simple
+PIP_MIRROR_URL=
+
+# https://github.com/langgenius/dify-plugin-daemon/blob/main/.env.example
+# Plugin storage type, local aws_s3 tencent_cos azure_blob aliyun_oss volcengine_tos
+PLUGIN_STORAGE_TYPE=local
+PLUGIN_STORAGE_LOCAL_ROOT=/app/storage
+PLUGIN_WORKING_PATH=/app/storage/cwd
+PLUGIN_INSTALLED_PATH=plugin
+PLUGIN_PACKAGE_CACHE_PATH=plugin_packages
+PLUGIN_MEDIA_CACHE_PATH=assets
+# Plugin oss bucket
+PLUGIN_STORAGE_OSS_BUCKET=
+# Plugin oss s3 credentials
+PLUGIN_S3_USE_AWS=false
+PLUGIN_S3_USE_AWS_MANAGED_IAM=false
+PLUGIN_S3_ENDPOINT=
+PLUGIN_S3_USE_PATH_STYLE=false
+PLUGIN_AWS_ACCESS_KEY=
+PLUGIN_AWS_SECRET_KEY=
+PLUGIN_AWS_REGION=
+# Plugin oss azure blob
+PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME=
+PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING=
+# Plugin oss tencent cos
+PLUGIN_TENCENT_COS_SECRET_KEY=
+PLUGIN_TENCENT_COS_SECRET_ID=
+PLUGIN_TENCENT_COS_REGION=
+# Plugin oss aliyun oss
+PLUGIN_ALIYUN_OSS_REGION=
+PLUGIN_ALIYUN_OSS_ENDPOINT=
+PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID=
+PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET=
+PLUGIN_ALIYUN_OSS_AUTH_VERSION=v4
+PLUGIN_ALIYUN_OSS_PATH=
+# Plugin oss volcengine tos
+PLUGIN_VOLCENGINE_TOS_ENDPOINT=
+PLUGIN_VOLCENGINE_TOS_ACCESS_KEY=
+PLUGIN_VOLCENGINE_TOS_SECRET_KEY=
+PLUGIN_VOLCENGINE_TOS_REGION=
+
+# ------------------------------
+# OTLP Collector Configuration
+# ------------------------------
+ENABLE_OTEL=false
+OTLP_TRACE_ENDPOINT=
+OTLP_METRIC_ENDPOINT=
+OTLP_BASE_ENDPOINT=http://localhost:4318
+OTLP_API_KEY=
+OTEL_EXPORTER_OTLP_PROTOCOL=
+OTEL_EXPORTER_TYPE=otlp
+OTEL_SAMPLING_RATE=0.1
+OTEL_BATCH_EXPORT_SCHEDULE_DELAY=5000
+OTEL_MAX_QUEUE_SIZE=2048
+OTEL_MAX_EXPORT_BATCH_SIZE=512
+OTEL_METRIC_EXPORT_INTERVAL=60000
+OTEL_BATCH_EXPORT_TIMEOUT=10000
+OTEL_METRIC_EXPORT_TIMEOUT=30000
+
+# Prevent Clickjacking
+ALLOW_EMBED=false
+
+# Dataset queue monitor configuration
+QUEUE_MONITOR_THRESHOLD=200
+# You can configure multiple ones, separated by commas. eg: test1@dify.ai,test2@dify.ai
+QUEUE_MONITOR_ALERT_EMAILS=
+# Monitor interval in minutes, default is 30 minutes
+QUEUE_MONITOR_INTERVAL=30
+
+# Swagger UI configuration
+SWAGGER_UI_ENABLED=true
+SWAGGER_UI_PATH=/swagger-ui.html
+
+# Celery schedule tasks configuration
+ENABLE_CLEAN_EMBEDDING_CACHE_TASK=false
+ENABLE_CLEAN_UNUSED_DATASETS_TASK=false
+ENABLE_CREATE_TIDB_SERVERLESS_TASK=false
+ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK=false
+ENABLE_CLEAN_MESSAGES=false
+ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK=false
+ENABLE_DATASETS_QUEUE_MONITOR=false
+ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK=true

dify/code/README.md

@@ -4,7 +4,7 @@ Welcome to the new `docker` directory for deploying Dify using Docker Compose. T
 
 ### What's Updated
 
-- **Certbot Container**: `docker-compose.yaml` now contains `certbot` for managing SSL certificates. This container automatically renews certificates and ensures secure HTTPS connections.  
+- **Certbot Container**: `docker-compose.yaml` now contains `certbot` for managing SSL certificates. This container automatically renews certificates and ensures secure HTTPS connections.\
   For more information, refer `docker/certbot/README.md`.
 
 - **Persistent Environment Variables**: Environment variables are now managed through a `.env` file, ensuring that your configurations persist across deployments.
@@ -13,40 +13,44 @@ Welcome to the new `docker` directory for deploying Dify using Docker Compose. T
   > The `.env` file is a crucial component in Docker and Docker Compose environments, serving as a centralized configuration file where you can define environment variables that are accessible to the containers at runtime. This file simplifies the management of environment settings across different stages of development, testing, and production, providing consistency and ease of configuration to deployments.
 
 - **Unified Vector Database Services**: All vector database services are now managed from a single Docker Compose file `docker-compose.yaml`. You can switch between different vector databases by setting the `VECTOR_STORE` environment variable in your `.env` file.
+
 - **Mandatory .env File**: A `.env` file is now required to run `docker compose up`. This file is crucial for configuring your deployment and for any custom settings to persist through upgrades.
-- **Legacy Support**: Previous deployment files are now located in the `docker-legacy` directory and will no longer be maintained.
 
 ### How to Deploy Dify with `docker-compose.yaml`
 
 1. **Prerequisites**: Ensure Docker and Docker Compose are installed on your system.
-2. **Environment Setup**:
-    - Navigate to the `docker` directory.
-    - Copy the `.env.example` file to a new file named `.env` by running `cp .env.example .env`.
-    - Customize the `.env` file as needed. Refer to the `.env.example` file for detailed configuration options.
-3. **Running the Services**:
-    - Execute `docker compose up` from the `docker` directory to start the services.
-    - To specify a vector database, set the `VECTOR_STORE` variable in your `.env` file to your desired vector database service, such as `milvus`, `weaviate`, or `opensearch`.
-4. **SSL Certificate Setup**:
-    - Rrefer `docker/certbot/README.md` to set up SSL certificates using Certbot.
+1. **Environment Setup**:
+   - Navigate to the `docker` directory.
+   - Copy the `.env.example` file to a new file named `.env` by running `cp .env.example .env`.
+   - Customize the `.env` file as needed. Refer to the `.env.example` file for detailed configuration options.
+1. **Running the Services**:
+   - Execute `docker compose up` from the `docker` directory to start the services.
+   - To specify a vector database, set the `VECTOR_STORE` variable in your `.env` file to your desired vector database service, such as `milvus`, `weaviate`, or `opensearch`.
+1. **SSL Certificate Setup**:
+   - Refer `docker/certbot/README.md` to set up SSL certificates using Certbot.
+1. **OpenTelemetry Collector Setup**:
+   - Change `ENABLE_OTEL` to `true` in `.env`.
+   - Configure `OTLP_BASE_ENDPOINT` properly.
 
 ### How to Deploy Middleware for Developing Dify
 
 1. **Middleware Setup**:
-    - Use the `docker-compose.middleware.yaml` for setting up essential middleware services like databases and caches.
-    - Navigate to the `docker` directory.
-    - Ensure the `middleware.env` file is created by running `cp middleware.env.example middleware.env` (refer to the `middleware.env.example` file).
-2. **Running Middleware Services**:
-    - Execute `docker-compose -f docker-compose.middleware.yaml up --env-file middleware.env -d` to start the middleware services.
+   - Use the `docker-compose.middleware.yaml` for setting up essential middleware services like databases and caches.
+   - Navigate to the `docker` directory.
+   - Ensure the `middleware.env` file is created by running `cp middleware.env.example middleware.env` (refer to the `middleware.env.example` file).
+1. **Running Middleware Services**:
+   - Navigate to the `docker` directory.
+   - Execute `docker compose -f docker-compose.middleware.yaml --profile weaviate -p dify up -d` to start the middleware services. (Change the profile to other vector database if you are not using weaviate)
 
 ### Migration for Existing Users
 
 For users migrating from the `docker-legacy` setup:
 
 1. **Review Changes**: Familiarize yourself with the new `.env` configuration and Docker Compose setup.
-2. **Transfer Customizations**:
-    - If you have customized configurations such as `docker-compose.yaml`, `ssrf_proxy/squid.conf`, or `nginx/conf.d/default.conf`, you will need to reflect these changes in the `.env` file you create.
-3. **Data Migration**:
-    - Ensure that data from services like databases and caches is backed up and migrated appropriately to the new structure if necessary.
+1. **Transfer Customizations**:
+   - If you have customized configurations such as `docker-compose.yaml`, `ssrf_proxy/squid.conf`, or `nginx/conf.d/default.conf`, you will need to reflect these changes in the `.env` file you create.
+1. **Data Migration**:
+   - Ensure that data from services like databases and caches is backed up and migrated appropriately to the new structure if necessary.
 
 ### Overview of `.env`
 
@@ -54,42 +58,56 @@ For users migrating from the `docker-legacy` setup:
 
 - **Vector Database Services**: Depending on the type of vector database used (`VECTOR_STORE`), users can set specific endpoints, ports, and authentication details.
 - **Storage Services**: Depending on the storage type (`STORAGE_TYPE`), users can configure specific settings for S3, Azure Blob, Google Storage, etc.
-- **API and Web Services**: Users can define URLs and other settings that affect how the API and web frontends operate.
+- **API and Web Services**: Users can define URLs and other settings that affect how the API and web frontend operate.
 
 #### Other notable variables
 
 The `.env.example` file provided in the Docker setup is extensive and covers a wide range of configuration options. It is structured into several sections, each pertaining to different aspects of the application and its services. Here are some of the key sections and variables:
 
 1. **Common Variables**:
-    - `CONSOLE_API_URL`, `SERVICE_API_URL`: URLs for different API services.
-    - `APP_WEB_URL`: Frontend application URL.
-    - `FILES_URL`: Base URL for file downloads and previews.
 
-2. **Server Configuration**:
-    - `LOG_LEVEL`, `DEBUG`, `FLASK_DEBUG`: Logging and debug settings.
-    - `SECRET_KEY`: A key for encrypting session cookies and other sensitive data.
+   - `CONSOLE_API_URL`, `SERVICE_API_URL`: URLs for different API services.
+   - `APP_WEB_URL`: Frontend application URL.
+   - `FILES_URL`: Base URL for file downloads and previews.
 
-3. **Database Configuration**:
-    - `DB_USERNAME`, `DB_PASSWORD`, `DB_HOST`, `DB_PORT`, `DB_DATABASE`: PostgreSQL database credentials and connection details.
+1. **Server Configuration**:
 
-4. **Redis Configuration**:
-    - `REDIS_HOST`, `REDIS_PORT`, `REDIS_PASSWORD`: Redis server connection settings.
+   - `LOG_LEVEL`, `DEBUG`, `FLASK_DEBUG`: Logging and debug settings.
+   - `SECRET_KEY`: A key for encrypting session cookies and other sensitive data.
 
-5. **Celery Configuration**:
-    - `CELERY_BROKER_URL`: Configuration for Celery message broker.
+1. **Database Configuration**:
 
-6. **Storage Configuration**:
-    - `STORAGE_TYPE`, `S3_BUCKET_NAME`, `AZURE_BLOB_ACCOUNT_NAME`: Settings for file storage options like local, S3, Azure Blob, etc.
+   - `DB_USERNAME`, `DB_PASSWORD`, `DB_HOST`, `DB_PORT`, `DB_DATABASE`: PostgreSQL database credentials and connection details.
 
-7. **Vector Database Configuration**:
-    - `VECTOR_STORE`: Type of vector database (e.g., `weaviate`, `milvus`).
-    - Specific settings for each vector store like `WEAVIATE_ENDPOINT`, `MILVUS_URI`.
+1. **Redis Configuration**:
 
-8. **CORS Configuration**:
-    - `WEB_API_CORS_ALLOW_ORIGINS`, `CONSOLE_CORS_ALLOW_ORIGINS`: Settings for cross-origin resource sharing.
+   - `REDIS_HOST`, `REDIS_PORT`, `REDIS_PASSWORD`: Redis server connection settings.
 
-9. **Other Service-Specific Environment Variables**:
-    - Each service like `nginx`, `redis`, `db`, and vector databases have specific environment variables that are directly referenced in the `docker-compose.yaml`.
+1. **Celery Configuration**:
+
+   - `CELERY_BROKER_URL`: Configuration for Celery message broker.
+
+1. **Storage Configuration**:
+
+   - `STORAGE_TYPE`, `S3_BUCKET_NAME`, `AZURE_BLOB_ACCOUNT_NAME`: Settings for file storage options like local, S3, Azure Blob, etc.
+
+1. **Vector Database Configuration**:
+
+   - `VECTOR_STORE`: Type of vector database (e.g., `weaviate`, `milvus`).
+   - Specific settings for each vector store like `WEAVIATE_ENDPOINT`, `MILVUS_URI`.
+
+1. **CORS Configuration**:
+
+   - `WEB_API_CORS_ALLOW_ORIGINS`, `CONSOLE_CORS_ALLOW_ORIGINS`: Settings for cross-origin resource sharing.
+
+1. **OpenTelemetry Configuration**:
+
+   - `ENABLE_OTEL`: Enable OpenTelemetry collector in api.
+   - `OTLP_BASE_ENDPOINT`: Endpoint for your OTLP exporter.
+
+1. **Other Service-Specific Environment Variables**:
+
+   - Each service like `nginx`, `redis`, `db`, and vector databases have specific environment variables that are directly referenced in the `docker-compose.yaml`.
 
 ### Additional Information
 

dify/code/certbot/README.md

@@ -2,12 +2,12 @@
 
 ## Short description
 
-docker compose certbot configurations with Backward compatibility (without certbot container).  
+docker compose certbot configurations with Backward compatibility (without certbot container).\
 Use `docker compose --profile certbot up` to use this features.
 
 ## The simplest way for launching new servers with SSL certificates
 
-1. Get letsencrypt certs  
+1. Get letsencrypt certs\
    set `.env` values
    ```properties
    NGINX_SSL_CERT_FILENAME=fullchain.pem
@@ -25,7 +25,7 @@ Use `docker compose --profile certbot up` to use this features.
    ```shell
    docker compose exec -it certbot /bin/sh /update-cert.sh
    ```
-2. Edit `.env` file and `docker compose --profile certbot up` again.  
+1. Edit `.env` file and `docker compose --profile certbot up` again.\
    set `.env` value additionally
    ```properties
    NGINX_HTTPS_ENABLED=true
@@ -34,7 +34,7 @@ Use `docker compose --profile certbot up` to use this features.
    ```shell
    docker compose --profile certbot up -d --no-deps --force-recreate nginx
    ```
-   Then you can access your serve with HTTPS.  
+   Then you can access your serve with HTTPS.\
    [https://your_domain.com](https://your_domain.com)
 
 ## SSL certificates renewal

dify/code/couchbase-server/Dockerfile

@@ -1,4 +1,4 @@
 FROM couchbase/server:latest AS stage_base
-# FROM couchbase:latest AS stage_base 
+# FROM couchbase:latest AS stage_base
 COPY init-cbserver.sh /opt/couchbase/init/
-RUN chmod +x /opt/couchbase/init/init-cbserver.sh
+RUN chmod +x /opt/couchbase/init/init-cbserver.sh

dify/code/couchbase-server/init-cbserver.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
-# used to start couchbase server - can't get around this as docker compose only allows you to start one command - so we have to start couchbase like the standard couchbase Dockerfile would 
+# used to start couchbase server - can't get around this as docker compose only allows you to start one command - so we have to start couchbase like the standard couchbase Dockerfile would
 # https://github.com/couchbase/docker/blob/master/enterprise/couchbase-server/7.2.0/Dockerfile#L88
 
-/entrypoint.sh couchbase-server & 
+/entrypoint.sh couchbase-server &
 
 # track if setup is complete so we don't try to setup again
 FILE=/opt/couchbase/init/setupComplete.txt
@@ -36,9 +36,9 @@ if ! [ -f "$FILE" ]; then
   --bucket-ramsize $COUCHBASE_BUCKET_RAMSIZE \
   --bucket-type couchbase
 
-  # create file so we know that the cluster is setup and don't run the setup again 
+  # create file so we know that the cluster is setup and don't run the setup again
   touch $FILE
-fi 
+fi
   # docker compose will stop the container from running unless we do this
   # known issue and workaround
   tail -f /dev/null

dify/code/docker-compose-template.yaml

@@ -2,7 +2,7 @@ x-shared-env: &shared-api-worker-env
 services:
   # API service
   api:
-    image: langgenius/dify-api:0.15.2
+    image: langgenius/dify-api:1.8.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -12,9 +12,15 @@ services:
       SENTRY_DSN: ${API_SENTRY_DSN:-}
       SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
       SENTRY_PROFILES_SAMPLE_RATE: ${API_SENTRY_PROFILES_SAMPLE_RATE:-1.0}
+      PLUGIN_REMOTE_INSTALL_HOST: ${EXPOSE_PLUGIN_DEBUGGING_HOST:-localhost}
+      PLUGIN_REMOTE_INSTALL_PORT: ${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}
+      PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
+      INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
     depends_on:
-      - db
-      - redis
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_started
     volumes:
       # Mount the storage directory to the container, for storing user files.
       - ./volumes/app/storage:/app/api/storage
@@ -25,7 +31,7 @@ services:
   # worker service
   # The Celery worker for processing the queue.
   worker:
-    image: langgenius/dify-api:0.15.2
+    image: langgenius/dify-api:1.8.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -35,9 +41,13 @@ services:
       SENTRY_DSN: ${API_SENTRY_DSN:-}
       SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
       SENTRY_PROFILES_SAMPLE_RATE: ${API_SENTRY_PROFILES_SAMPLE_RATE:-1.0}
+      PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
+      INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
     depends_on:
-      - db
-      - redis
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_started
     volumes:
       # Mount the storage directory to the container, for storing user files.
       - ./volumes/app/storage:/app/api/storage
@@ -45,9 +55,28 @@ services:
       - ssrf_proxy_network
       - default
 
+  # worker_beat service
+  # Celery beat for scheduling periodic tasks.
+  worker_beat:
+    image: langgenius/dify-api:1.8.0
+    restart: always
+    environment:
+      # Use the shared environment variables.
+      <<: *shared-api-worker-env
+      # Startup mode, 'worker_beat' starts the Celery beat for scheduling periodic tasks.
+      MODE: beat
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_started
+    networks:
+      - ssrf_proxy_network
+      - default
+
   # Frontend web application.
   web:
-    image: langgenius/dify-web:0.15.2
+    image: langgenius/dify-web:1.8.0
     restart: always
     environment:
       CONSOLE_API_URL: ${CONSOLE_API_URL:-}
@@ -56,15 +85,27 @@ services:
       NEXT_TELEMETRY_DISABLED: ${NEXT_TELEMETRY_DISABLED:-0}
       TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}
       CSP_WHITELIST: ${CSP_WHITELIST:-}
+      ALLOW_EMBED: ${ALLOW_EMBED:-false}
+      ALLOW_UNSAFE_DATA_SCHEME: ${ALLOW_UNSAFE_DATA_SCHEME:-false}
+      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
+      MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace.dify.ai}
       TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-}
       INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-}
-
+      PM2_INSTANCES: ${PM2_INSTANCES:-2}
+      LOOP_NODE_MAX_COUNT: ${LOOP_NODE_MAX_COUNT:-100}
+      MAX_TOOLS_NUM: ${MAX_TOOLS_NUM:-10}
+      MAX_PARALLEL_LIMIT: ${MAX_PARALLEL_LIMIT:-10}
+      MAX_ITERATIONS_NUM: ${MAX_ITERATIONS_NUM:-99}
+      MAX_TREE_DEPTH: ${MAX_TREE_DEPTH:-50}
+      ENABLE_WEBSITE_JINAREADER: ${ENABLE_WEBSITE_JINAREADER:-true}
+      ENABLE_WEBSITE_FIRECRAWL: ${ENABLE_WEBSITE_FIRECRAWL:-true}
+      ENABLE_WEBSITE_WATERCRAWL: ${ENABLE_WEBSITE_WATERCRAWL:-true}
   # The postgres database.
   db:
     image: postgres:15-alpine
     restart: always
     environment:
-      PGUSER: ${PGUSER:-postgres}
+      POSTGRES_USER: ${POSTGRES_USER:-postgres}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-difyai123456}
       POSTGRES_DB: ${POSTGRES_DB:-dify}
       PGDATA: ${PGDATA:-/var/lib/postgresql/data/pgdata}
@@ -77,10 +118,10 @@ services:
     volumes:
       - ./volumes/db/data:/var/lib/postgresql/data
     healthcheck:
-      test: [ 'CMD', 'pg_isready' ]
+      test: [ 'CMD', 'pg_isready', '-h', 'db', '-U', '${PGUSER:-postgres}', '-d', '${POSTGRES_DB:-dify}' ]
       interval: 1s
       timeout: 3s
-      retries: 30
+      retries: 60
 
   # The redis cache.
   redis:
@@ -98,7 +139,7 @@ services:
 
   # The DifySandbox
   sandbox:
-    image: langgenius/dify-sandbox:0.2.10
+    image: langgenius/dify-sandbox:0.2.12
     restart: always
     environment:
       # The DifySandbox configurations
@@ -111,16 +152,79 @@ services:
       HTTP_PROXY: ${SANDBOX_HTTP_PROXY:-http://ssrf_proxy:3128}
       HTTPS_PROXY: ${SANDBOX_HTTPS_PROXY:-http://ssrf_proxy:3128}
       SANDBOX_PORT: ${SANDBOX_PORT:-8194}
+      PIP_MIRROR_URL: ${PIP_MIRROR_URL:-}
     volumes:
       - ./volumes/sandbox/dependencies:/dependencies
+      - ./volumes/sandbox/conf:/conf
     healthcheck:
       test: [ 'CMD', 'curl', '-f', 'http://localhost:8194/health' ]
     networks:
       - ssrf_proxy_network
 
+  # plugin daemon
+  plugin_daemon:
+    image: langgenius/dify-plugin-daemon:0.2.0-local
+    restart: always
+    environment:
+      # Use the shared environment variables.
+      <<: *shared-api-worker-env
+      DB_DATABASE: ${DB_PLUGIN_DATABASE:-dify_plugin}
+      SERVER_PORT: ${PLUGIN_DAEMON_PORT:-5002}
+      SERVER_KEY: ${PLUGIN_DAEMON_KEY:-lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi}
+      MAX_PLUGIN_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
+      PPROF_ENABLED: ${PLUGIN_PPROF_ENABLED:-false}
+      DIFY_INNER_API_URL: ${PLUGIN_DIFY_INNER_API_URL:-http://api:5001}
+      DIFY_INNER_API_KEY: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
+      PLUGIN_REMOTE_INSTALLING_HOST: ${PLUGIN_DEBUGGING_HOST:-0.0.0.0}
+      PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_DEBUGGING_PORT:-5003}
+      PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd}
+      FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true}
+      PYTHON_ENV_INIT_TIMEOUT: ${PLUGIN_PYTHON_ENV_INIT_TIMEOUT:-120}
+      PLUGIN_MAX_EXECUTION_TIMEOUT: ${PLUGIN_MAX_EXECUTION_TIMEOUT:-600}
+      PLUGIN_STDIO_BUFFER_SIZE: ${PLUGIN_STDIO_BUFFER_SIZE:-1024}
+      PLUGIN_STDIO_MAX_BUFFER_SIZE: ${PLUGIN_STDIO_MAX_BUFFER_SIZE:-5242880}
+      PIP_MIRROR_URL: ${PIP_MIRROR_URL:-}
+      PLUGIN_STORAGE_TYPE: ${PLUGIN_STORAGE_TYPE:-local}
+      PLUGIN_STORAGE_LOCAL_ROOT: ${PLUGIN_STORAGE_LOCAL_ROOT:-/app/storage}
+      PLUGIN_INSTALLED_PATH: ${PLUGIN_INSTALLED_PATH:-plugin}
+      PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
+      PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
+      PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
+      S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
+      S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false}
+      S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
+      S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
+      AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
+      AWS_SECRET_KEY: ${PLUGIN_AWS_SECRET_KEY:-}
+      AWS_REGION: ${PLUGIN_AWS_REGION:-}
+      AZURE_BLOB_STORAGE_CONNECTION_STRING: ${PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING:-}
+      AZURE_BLOB_STORAGE_CONTAINER_NAME: ${PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME:-}
+      TENCENT_COS_SECRET_KEY: ${PLUGIN_TENCENT_COS_SECRET_KEY:-}
+      TENCENT_COS_SECRET_ID: ${PLUGIN_TENCENT_COS_SECRET_ID:-}
+      TENCENT_COS_REGION: ${PLUGIN_TENCENT_COS_REGION:-}
+      ALIYUN_OSS_REGION: ${PLUGIN_ALIYUN_OSS_REGION:-}
+      ALIYUN_OSS_ENDPOINT: ${PLUGIN_ALIYUN_OSS_ENDPOINT:-}
+      ALIYUN_OSS_ACCESS_KEY_ID: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID:-}
+      ALIYUN_OSS_ACCESS_KEY_SECRET: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET:-}
+      ALIYUN_OSS_AUTH_VERSION: ${PLUGIN_ALIYUN_OSS_AUTH_VERSION:-v4}
+      ALIYUN_OSS_PATH: ${PLUGIN_ALIYUN_OSS_PATH:-}
+      VOLCENGINE_TOS_ENDPOINT: ${PLUGIN_VOLCENGINE_TOS_ENDPOINT:-}
+      VOLCENGINE_TOS_ACCESS_KEY: ${PLUGIN_VOLCENGINE_TOS_ACCESS_KEY:-}
+      VOLCENGINE_TOS_SECRET_KEY: ${PLUGIN_VOLCENGINE_TOS_SECRET_KEY:-}
+      VOLCENGINE_TOS_REGION: ${PLUGIN_VOLCENGINE_TOS_REGION:-}
+      SENTRY_ENABLED: ${PLUGIN_SENTRY_ENABLED:-false}
+      SENTRY_DSN: ${PLUGIN_SENTRY_DSN:-}
+    ports:
+      - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}"
+    volumes:
+      - ./volumes/plugin_daemon:/app/storage
+    depends_on:
+      db:
+        condition: service_healthy
+
   # ssrf_proxy server
   # for more information, please refer to
-  # https://docs.dify.ai/learn-more/faq/install-faq#id-18.-why-is-ssrf_proxy-needed
+  # https://docs.dify.ai/learn-more/faq/install-faq#18-why-is-ssrf-proxy-needed%3F
   ssrf_proxy:
     image: ubuntu/squid:latest
     restart: always
@@ -186,7 +290,7 @@ services:
       NGINX_SSL_CERT_KEY_FILENAME: ${NGINX_SSL_CERT_KEY_FILENAME:-dify.key}
       NGINX_SSL_PROTOCOLS: ${NGINX_SSL_PROTOCOLS:-TLSv1.1 TLSv1.2 TLSv1.3}
       NGINX_WORKER_PROCESSES: ${NGINX_WORKER_PROCESSES:-auto}
-      NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-15M}
+      NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-100M}
       NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-65}
       NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600s}
       NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600s}
@@ -199,16 +303,6 @@ services:
       - '${EXPOSE_NGINX_PORT:-80}:${NGINX_PORT:-80}'
       - '${EXPOSE_NGINX_SSL_PORT:-443}:${NGINX_SSL_PORT:-443}'
 
-  # The TiDB vector store.
-  # For production use, please refer to https://github.com/pingcap/tidb-docker-compose
-  tidb:
-    image: pingcap/tidb:v8.4.0
-    profiles:
-      - tidb
-    command:
-      - --store=unistore
-    restart: always
-
   # The Weaviate vector store.
   weaviate:
     image: semitechnologies/weaviate:1.19.0
@@ -292,8 +386,37 @@ services:
       POSTGRES_DB: ${PGVECTOR_POSTGRES_DB:-dify}
       # postgres data directory
       PGDATA: ${PGVECTOR_PGDATA:-/var/lib/postgresql/data/pgdata}
+      # pg_bigm module for full text search
+      PG_BIGM: ${PGVECTOR_PG_BIGM:-false}
+      PG_BIGM_VERSION: ${PGVECTOR_PG_BIGM_VERSION:-1.2-20240606}
     volumes:
       - ./volumes/pgvector/data:/var/lib/postgresql/data
+      - ./pgvector/docker-entrypoint.sh:/docker-entrypoint.sh
+    entrypoint: [ '/docker-entrypoint.sh' ]
+    healthcheck:
+      test: [ 'CMD', 'pg_isready' ]
+      interval: 1s
+      timeout: 3s
+      retries: 30
+
+  # get image from https://www.vastdata.com.cn/
+  vastbase:
+    image: vastdata/vastbase-vector
+    profiles:
+      - vastbase
+    restart: always
+    environment:
+      - VB_DBCOMPATIBILITY=PG
+      - VB_DB=dify
+      - VB_USERNAME=dify
+      - VB_PASSWORD=Difyai123456
+    ports:
+      - '5434:5432'
+    volumes:
+      - ./vastbase/lic:/home/vastbase/vastbase/lic
+      - ./vastbase/data:/home/vastbase/data
+      - ./vastbase/backup:/home/vastbase/backup
+      - ./vastbase/backup_log:/home/vastbase/backup_log
     healthcheck:
       test: [ 'CMD', 'pg_isready' ]
       interval: 1s
@@ -337,7 +460,8 @@ services:
 
   # OceanBase vector database
   oceanbase:
-    image: quay.io/oceanbase/oceanbase-ce:4.3.3.0-100000142024101215
+    image: oceanbase/oceanbase-ce:4.3.5-lts
+    container_name: oceanbase
     profiles:
       - oceanbase
     restart: always
@@ -350,7 +474,16 @@ services:
       OB_SYS_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
       OB_TENANT_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
       OB_CLUSTER_NAME: ${OCEANBASE_CLUSTER_NAME:-difyai}
-      OB_SERVER_IP: '127.0.0.1'
+      OB_SERVER_IP: 127.0.0.1
+      MODE: mini
+    ports:
+      - "${OCEANBASE_VECTOR_PORT:-2881}:2881"
+    healthcheck:
+      test: [ 'CMD-SHELL', 'obclient -h127.0.0.1 -P2881 -uroot@test -p$${OB_TENANT_PASSWORD} -e "SELECT 1;"' ]
+      interval: 10s
+      retries: 30
+      start_period: 30s
+      timeout: 10s
 
   # Oracle vector database
   oracle:
@@ -410,7 +543,7 @@ services:
 
   milvus-standalone:
     container_name: milvus-standalone
-    image: milvusdb/milvus:v2.5.0-beta
+    image: milvusdb/milvus:v2.5.15
     profiles:
       - milvus
     command: [ 'milvus', 'run', 'standalone' ]
@@ -472,6 +605,28 @@ services:
     depends_on:
       - opensearch
 
+  # opengauss vector database.
+  opengauss:
+    image: opengauss/opengauss:7.0.0-RC1
+    profiles:
+      - opengauss
+    privileged: true
+    restart: always
+    environment:
+      GS_USERNAME: ${OPENGAUSS_USER:-postgres}
+      GS_PASSWORD: ${OPENGAUSS_PASSWORD:-Dify@123}
+      GS_PORT: ${OPENGAUSS_PORT:-6600}
+      GS_DB: ${OPENGAUSS_DATABASE:-dify}
+    volumes:
+      - ./volumes/opengauss/data:/var/lib/opengauss/data
+    healthcheck:
+      test: [ "CMD-SHELL", "netstat -lntp | grep tcp6 > /dev/null 2>&1" ]
+      interval: 10s
+      timeout: 10s
+      retries: 10
+    ports:
+      - ${OPENGAUSS_PORT:-6600}:${OPENGAUSS_PORT:-6600}
+
   # MyScale vector database
   myscale:
     container_name: myscale
@@ -487,6 +642,18 @@ services:
     ports:
       - ${MYSCALE_PORT:-8123}:${MYSCALE_PORT:-8123}
 
+  # Matrixone vector store.
+  matrixone:
+    hostname: matrixone
+    image: matrixorigin/matrixone:2.1.1
+    profiles:
+      - matrixone
+    restart: always
+    volumes:
+      - ./volumes/matrixone/data:/mo-data
+    ports:
+      - ${MATRIXONE_PORT:-6001}:${MATRIXONE_PORT:-6001}
+
   # https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html
   # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-prod-prerequisites
   elasticsearch:

dify/code/docker-compose.middleware.yaml

@@ -20,7 +20,7 @@ services:
     ports:
       - "${EXPOSE_POSTGRES_PORT:-5432}:5432"
     healthcheck:
-      test: [ "CMD", "pg_isready" ]
+      test: [ 'CMD', 'pg_isready', '-h', 'db', '-U', '${PGUSER:-postgres}', '-d', '${POSTGRES_DB:-dify}' ]
       interval: 1s
       timeout: 3s
       retries: 30
@@ -29,6 +29,8 @@ services:
   redis:
     image: redis:6-alpine
     restart: always
+    env_file:
+      - ./middleware.env
     environment:
       REDISCLI_AUTH: ${REDIS_PASSWORD:-difyai123456}
     volumes:
@@ -43,8 +45,10 @@ services:
 
   # The DifySandbox
   sandbox:
-    image: langgenius/dify-sandbox:0.2.10
+    image: langgenius/dify-sandbox:0.2.12
     restart: always
+    env_file:
+      - ./middleware.env
     environment:
       # The DifySandbox configurations
       # Make sure you are changing this key for your deployment with a strong key.
@@ -56,6 +60,7 @@ services:
       HTTP_PROXY: ${SANDBOX_HTTP_PROXY:-http://ssrf_proxy:3128}
       HTTPS_PROXY: ${SANDBOX_HTTPS_PROXY:-http://ssrf_proxy:3128}
       SANDBOX_PORT: ${SANDBOX_PORT:-8194}
+      PIP_MIRROR_URL: ${PIP_MIRROR_URL:-}
     volumes:
       - ./volumes/sandbox/dependencies:/dependencies
       - ./volumes/sandbox/conf:/conf
@@ -64,9 +69,72 @@ services:
     networks:
       - ssrf_proxy_network
 
+  # plugin daemon
+  plugin_daemon:
+    image: langgenius/dify-plugin-daemon:0.2.0-local
+    restart: always
+    env_file:
+      - ./middleware.env
+    environment:
+      # Use the shared environment variables.
+      DB_HOST: ${DB_HOST:-db}
+      DB_PORT: ${DB_PORT:-5432}
+      DB_USERNAME: ${DB_USER:-postgres}
+      DB_PASSWORD: ${DB_PASSWORD:-difyai123456}
+      DB_DATABASE: ${DB_PLUGIN_DATABASE:-dify_plugin}
+      REDIS_HOST: ${REDIS_HOST:-redis}
+      REDIS_PORT: ${REDIS_PORT:-6379}
+      REDIS_PASSWORD: ${REDIS_PASSWORD:-difyai123456}
+      SERVER_PORT: ${PLUGIN_DAEMON_PORT:-5002}
+      SERVER_KEY: ${PLUGIN_DAEMON_KEY:-lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi}
+      MAX_PLUGIN_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
+      PPROF_ENABLED: ${PLUGIN_PPROF_ENABLED:-false}
+      DIFY_INNER_API_URL: ${PLUGIN_DIFY_INNER_API_URL:-http://host.docker.internal:5001}
+      DIFY_INNER_API_KEY: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
+      PLUGIN_REMOTE_INSTALLING_HOST: ${PLUGIN_DEBUGGING_HOST:-0.0.0.0}
+      PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_DEBUGGING_PORT:-5003}
+      PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd}
+      FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true}
+      PYTHON_ENV_INIT_TIMEOUT: ${PLUGIN_PYTHON_ENV_INIT_TIMEOUT:-120}
+      PLUGIN_MAX_EXECUTION_TIMEOUT: ${PLUGIN_MAX_EXECUTION_TIMEOUT:-600}
+      PIP_MIRROR_URL: ${PIP_MIRROR_URL:-}
+      PLUGIN_STORAGE_TYPE: ${PLUGIN_STORAGE_TYPE:-local}
+      PLUGIN_STORAGE_LOCAL_ROOT: ${PLUGIN_STORAGE_LOCAL_ROOT:-/app/storage}
+      PLUGIN_INSTALLED_PATH: ${PLUGIN_INSTALLED_PATH:-plugin}
+      PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
+      PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
+      PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
+      S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false}
+      S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
+      S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
+      S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
+      AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
+      AWS_SECRET_KEY: ${PLUGIN_AWS_SECRET_KEY:-}
+      AWS_REGION: ${PLUGIN_AWS_REGION:-}
+      AZURE_BLOB_STORAGE_CONNECTION_STRING: ${PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING:-}
+      AZURE_BLOB_STORAGE_CONTAINER_NAME: ${PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME:-}
+      TENCENT_COS_SECRET_KEY: ${PLUGIN_TENCENT_COS_SECRET_KEY:-}
+      TENCENT_COS_SECRET_ID: ${PLUGIN_TENCENT_COS_SECRET_ID:-}
+      TENCENT_COS_REGION: ${PLUGIN_TENCENT_COS_REGION:-}
+      ALIYUN_OSS_REGION: ${PLUGIN_ALIYUN_OSS_REGION:-}
+      ALIYUN_OSS_ENDPOINT: ${PLUGIN_ALIYUN_OSS_ENDPOINT:-}
+      ALIYUN_OSS_ACCESS_KEY_ID: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID:-}
+      ALIYUN_OSS_ACCESS_KEY_SECRET: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET:-}
+      ALIYUN_OSS_AUTH_VERSION: ${PLUGIN_ALIYUN_OSS_AUTH_VERSION:-v4}
+      ALIYUN_OSS_PATH: ${PLUGIN_ALIYUN_OSS_PATH:-}
+      VOLCENGINE_TOS_ENDPOINT: ${PLUGIN_VOLCENGINE_TOS_ENDPOINT:-}
+      VOLCENGINE_TOS_ACCESS_KEY: ${PLUGIN_VOLCENGINE_TOS_ACCESS_KEY:-}
+      VOLCENGINE_TOS_SECRET_KEY: ${PLUGIN_VOLCENGINE_TOS_SECRET_KEY:-}
+      VOLCENGINE_TOS_REGION: ${PLUGIN_VOLCENGINE_TOS_REGION:-}
+    ports:
+      - "${EXPOSE_PLUGIN_DAEMON_PORT:-5002}:${PLUGIN_DAEMON_PORT:-5002}"
+      - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}"
+    volumes:
+      - ./volumes/plugin_daemon:/app/storage
+
   # ssrf_proxy server
   # for more information, please refer to
-  # https://docs.dify.ai/learn-more/faq/install-faq#id-18.-why-is-ssrf_proxy-needed
+  # https://docs.dify.ai/learn-more/faq/install-faq#18-why-is-ssrf-proxy-needed%3F
   ssrf_proxy:
     image: ubuntu/squid:latest
     restart: always
@@ -74,6 +142,8 @@ services:
       - ./ssrf_proxy/squid.conf.template:/etc/squid/squid.conf.template
       - ./ssrf_proxy/docker-entrypoint.sh:/docker-entrypoint-mount.sh
     entrypoint: [ "sh", "-c", "cp /docker-entrypoint-mount.sh /docker-entrypoint.sh && sed -i 's/\r$$//' /docker-entrypoint.sh && chmod +x /docker-entrypoint.sh && /docker-entrypoint.sh" ]
+    env_file:
+      - ./middleware.env
     environment:
       # pls clearly modify the squid env vars to fit your network environment.
       HTTP_PORT: ${SSRF_HTTP_PORT:-3128}

dify/code/docker-compose.yaml

@@ -11,6 +11,10 @@ x-shared-env: &shared-api-worker-env
   APP_API_URL: ${APP_API_URL:-}
   APP_WEB_URL: ${APP_WEB_URL:-}
   FILES_URL: ${FILES_URL:-}
+  INTERNAL_FILES_URL: ${INTERNAL_FILES_URL:-}
+  LANG: ${LANG:-en_US.UTF-8}
+  LC_ALL: ${LC_ALL:-en_US.UTF-8}
+  PYTHONIOENCODING: ${PYTHONIOENCODING:-utf-8}
   LOG_LEVEL: ${LOG_LEVEL:-INFO}
   LOG_FILE: ${LOG_FILE:-/app/logs/server.log}
   LOG_FILE_MAX_SIZE: ${LOG_FILE_MAX_SIZE:-20}
@@ -19,6 +23,7 @@ x-shared-env: &shared-api-worker-env
   LOG_TZ: ${LOG_TZ:-UTC}
   DEBUG: ${DEBUG:-false}
   FLASK_DEBUG: ${FLASK_DEBUG:-false}
+  ENABLE_REQUEST_LOGGING: ${ENABLE_REQUEST_LOGGING:-False}
   SECRET_KEY: ${SECRET_KEY:-sk-9f73s3ljTXVcMT3Blb3ljTqtsKiGHXVcMT3BlbkFJLK7U}
   INIT_PASSWORD: ${INIT_PASSWORD:-}
   DEPLOY_ENV: ${DEPLOY_ENV:-PRODUCTION}
@@ -43,14 +48,20 @@ x-shared-env: &shared-api-worker-env
   CELERY_MIN_WORKERS: ${CELERY_MIN_WORKERS:-}
   API_TOOL_DEFAULT_CONNECT_TIMEOUT: ${API_TOOL_DEFAULT_CONNECT_TIMEOUT:-10}
   API_TOOL_DEFAULT_READ_TIMEOUT: ${API_TOOL_DEFAULT_READ_TIMEOUT:-60}
+  ENABLE_WEBSITE_JINAREADER: ${ENABLE_WEBSITE_JINAREADER:-true}
+  ENABLE_WEBSITE_FIRECRAWL: ${ENABLE_WEBSITE_FIRECRAWL:-true}
+  ENABLE_WEBSITE_WATERCRAWL: ${ENABLE_WEBSITE_WATERCRAWL:-true}
   DB_USERNAME: ${DB_USERNAME:-postgres}
   DB_PASSWORD: ${DB_PASSWORD:-difyai123456}
   DB_HOST: ${DB_HOST:-db}
   DB_PORT: ${DB_PORT:-5432}
   DB_DATABASE: ${DB_DATABASE:-dify}
   SQLALCHEMY_POOL_SIZE: ${SQLALCHEMY_POOL_SIZE:-30}
+  SQLALCHEMY_MAX_OVERFLOW: ${SQLALCHEMY_MAX_OVERFLOW:-10}
   SQLALCHEMY_POOL_RECYCLE: ${SQLALCHEMY_POOL_RECYCLE:-3600}
   SQLALCHEMY_ECHO: ${SQLALCHEMY_ECHO:-false}
+  SQLALCHEMY_POOL_PRE_PING: ${SQLALCHEMY_POOL_PRE_PING:-false}
+  SQLALCHEMY_POOL_USE_LIFO: ${SQLALCHEMY_POOL_USE_LIFO:-false}
   POSTGRES_MAX_CONNECTIONS: ${POSTGRES_MAX_CONNECTIONS:-100}
   POSTGRES_SHARED_BUFFERS: ${POSTGRES_SHARED_BUFFERS:-128MB}
   POSTGRES_WORK_MEM: ${POSTGRES_WORK_MEM:-4MB}
@@ -61,6 +72,10 @@ x-shared-env: &shared-api-worker-env
   REDIS_USERNAME: ${REDIS_USERNAME:-}
   REDIS_PASSWORD: ${REDIS_PASSWORD:-difyai123456}
   REDIS_USE_SSL: ${REDIS_USE_SSL:-false}
+  REDIS_SSL_CERT_REQS: ${REDIS_SSL_CERT_REQS:-CERT_NONE}
+  REDIS_SSL_CA_CERTS: ${REDIS_SSL_CA_CERTS:-}
+  REDIS_SSL_CERTFILE: ${REDIS_SSL_CERTFILE:-}
+  REDIS_SSL_KEYFILE: ${REDIS_SSL_KEYFILE:-}
   REDIS_DB: ${REDIS_DB:-0}
   REDIS_USE_SENTINEL: ${REDIS_USE_SENTINEL:-false}
   REDIS_SENTINELS: ${REDIS_SENTINELS:-}
@@ -72,15 +87,21 @@ x-shared-env: &shared-api-worker-env
   REDIS_CLUSTERS: ${REDIS_CLUSTERS:-}
   REDIS_CLUSTERS_PASSWORD: ${REDIS_CLUSTERS_PASSWORD:-}
   CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://:difyai123456@redis:6379/1}
+  CELERY_BACKEND: ${CELERY_BACKEND:-redis}
   BROKER_USE_SSL: ${BROKER_USE_SSL:-false}
   CELERY_USE_SENTINEL: ${CELERY_USE_SENTINEL:-false}
   CELERY_SENTINEL_MASTER_NAME: ${CELERY_SENTINEL_MASTER_NAME:-}
+  CELERY_SENTINEL_PASSWORD: ${CELERY_SENTINEL_PASSWORD:-}
   CELERY_SENTINEL_SOCKET_TIMEOUT: ${CELERY_SENTINEL_SOCKET_TIMEOUT:-0.1}
   WEB_API_CORS_ALLOW_ORIGINS: ${WEB_API_CORS_ALLOW_ORIGINS:-*}
   CONSOLE_CORS_ALLOW_ORIGINS: ${CONSOLE_CORS_ALLOW_ORIGINS:-*}
   STORAGE_TYPE: ${STORAGE_TYPE:-opendal}
   OPENDAL_SCHEME: ${OPENDAL_SCHEME:-fs}
   OPENDAL_FS_ROOT: ${OPENDAL_FS_ROOT:-storage}
+  CLICKZETTA_VOLUME_TYPE: ${CLICKZETTA_VOLUME_TYPE:-user}
+  CLICKZETTA_VOLUME_NAME: ${CLICKZETTA_VOLUME_NAME:-}
+  CLICKZETTA_VOLUME_TABLE_PREFIX: ${CLICKZETTA_VOLUME_TABLE_PREFIX:-dataset_}
+  CLICKZETTA_VOLUME_DIFY_PREFIX: ${CLICKZETTA_VOLUME_DIFY_PREFIX:-dify_km}
   S3_ENDPOINT: ${S3_ENDPOINT:-}
   S3_REGION: ${S3_REGION:-us-east-1}
   S3_BUCKET_NAME: ${S3_BUCKET_NAME:-difyai}
@@ -105,7 +126,7 @@ x-shared-env: &shared-api-worker-env
   TENCENT_COS_SECRET_ID: ${TENCENT_COS_SECRET_ID:-your-secret-id}
   TENCENT_COS_REGION: ${TENCENT_COS_REGION:-your-region}
   TENCENT_COS_SCHEME: ${TENCENT_COS_SCHEME:-your-scheme}
-  OCI_ENDPOINT: ${OCI_ENDPOINT:-https://objectstorage.us-ashburn-1.oraclecloud.com}
+  OCI_ENDPOINT: ${OCI_ENDPOINT:-https://your-object-storage-namespace.compat.objectstorage.us-ashburn-1.oraclecloud.com}
   OCI_BUCKET_NAME: ${OCI_BUCKET_NAME:-your-bucket-name}
   OCI_ACCESS_KEY: ${OCI_ACCESS_KEY:-your-access-key}
   OCI_SECRET_KEY: ${OCI_SECRET_KEY:-your-secret-key}
@@ -127,6 +148,7 @@ x-shared-env: &shared-api-worker-env
   SUPABASE_API_KEY: ${SUPABASE_API_KEY:-your-access-key}
   SUPABASE_URL: ${SUPABASE_URL:-your-server-url}
   VECTOR_STORE: ${VECTOR_STORE:-weaviate}
+  VECTOR_INDEX_NAME_PREFIX: ${VECTOR_INDEX_NAME_PREFIX:-Vector_index}
   WEAVIATE_ENDPOINT: ${WEAVIATE_ENDPOINT:-http://weaviate:8080}
   WEAVIATE_API_KEY: ${WEAVIATE_API_KEY:-WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih}
   QDRANT_URL: ${QDRANT_URL:-http://qdrant:6333}
@@ -134,11 +156,14 @@ x-shared-env: &shared-api-worker-env
   QDRANT_CLIENT_TIMEOUT: ${QDRANT_CLIENT_TIMEOUT:-20}
   QDRANT_GRPC_ENABLED: ${QDRANT_GRPC_ENABLED:-false}
   QDRANT_GRPC_PORT: ${QDRANT_GRPC_PORT:-6334}
-  MILVUS_URI: ${MILVUS_URI:-http://127.0.0.1:19530}
+  QDRANT_REPLICATION_FACTOR: ${QDRANT_REPLICATION_FACTOR:-1}
+  MILVUS_URI: ${MILVUS_URI:-http://host.docker.internal:19530}
+  MILVUS_DATABASE: ${MILVUS_DATABASE:-}
   MILVUS_TOKEN: ${MILVUS_TOKEN:-}
-  MILVUS_USER: ${MILVUS_USER:-root}
-  MILVUS_PASSWORD: ${MILVUS_PASSWORD:-Milvus}
+  MILVUS_USER: ${MILVUS_USER:-}
+  MILVUS_PASSWORD: ${MILVUS_PASSWORD:-}
   MILVUS_ENABLE_HYBRID_SEARCH: ${MILVUS_ENABLE_HYBRID_SEARCH:-False}
+  MILVUS_ANALYZER_PARAMS: ${MILVUS_ANALYZER_PARAMS:-}
   MYSCALE_HOST: ${MYSCALE_HOST:-myscale}
   MYSCALE_PORT: ${MYSCALE_PORT:-8123}
   MYSCALE_USER: ${MYSCALE_USER:-default}
@@ -157,6 +182,15 @@ x-shared-env: &shared-api-worker-env
   PGVECTOR_DATABASE: ${PGVECTOR_DATABASE:-dify}
   PGVECTOR_MIN_CONNECTION: ${PGVECTOR_MIN_CONNECTION:-1}
   PGVECTOR_MAX_CONNECTION: ${PGVECTOR_MAX_CONNECTION:-5}
+  PGVECTOR_PG_BIGM: ${PGVECTOR_PG_BIGM:-false}
+  PGVECTOR_PG_BIGM_VERSION: ${PGVECTOR_PG_BIGM_VERSION:-1.2-20240606}
+  VASTBASE_HOST: ${VASTBASE_HOST:-vastbase}
+  VASTBASE_PORT: ${VASTBASE_PORT:-5432}
+  VASTBASE_USER: ${VASTBASE_USER:-dify}
+  VASTBASE_PASSWORD: ${VASTBASE_PASSWORD:-Difyai123456}
+  VASTBASE_DATABASE: ${VASTBASE_DATABASE:-dify}
+  VASTBASE_MIN_CONNECTION: ${VASTBASE_MIN_CONNECTION:-1}
+  VASTBASE_MAX_CONNECTION: ${VASTBASE_MAX_CONNECTION:-5}
   PGVECTO_RS_HOST: ${PGVECTO_RS_HOST:-pgvecto-rs}
   PGVECTO_RS_PORT: ${PGVECTO_RS_PORT:-5432}
   PGVECTO_RS_USER: ${PGVECTO_RS_USER:-postgres}
@@ -179,6 +213,11 @@ x-shared-env: &shared-api-worker-env
   TIDB_VECTOR_USER: ${TIDB_VECTOR_USER:-}
   TIDB_VECTOR_PASSWORD: ${TIDB_VECTOR_PASSWORD:-}
   TIDB_VECTOR_DATABASE: ${TIDB_VECTOR_DATABASE:-dify}
+  MATRIXONE_HOST: ${MATRIXONE_HOST:-matrixone}
+  MATRIXONE_PORT: ${MATRIXONE_PORT:-6001}
+  MATRIXONE_USER: ${MATRIXONE_USER:-dump}
+  MATRIXONE_PASSWORD: ${MATRIXONE_PASSWORD:-111}
+  MATRIXONE_DATABASE: ${MATRIXONE_DATABASE:-dify}
   TIDB_ON_QDRANT_URL: ${TIDB_ON_QDRANT_URL:-http://127.0.0.1}
   TIDB_ON_QDRANT_API_KEY: ${TIDB_ON_QDRANT_API_KEY:-dify}
   TIDB_ON_QDRANT_CLIENT_TIMEOUT: ${TIDB_ON_QDRANT_CLIENT_TIMEOUT:-20}
@@ -197,11 +236,13 @@ x-shared-env: &shared-api-worker-env
   CHROMA_DATABASE: ${CHROMA_DATABASE:-default_database}
   CHROMA_AUTH_PROVIDER: ${CHROMA_AUTH_PROVIDER:-chromadb.auth.token_authn.TokenAuthClientProvider}
   CHROMA_AUTH_CREDENTIALS: ${CHROMA_AUTH_CREDENTIALS:-}
-  ORACLE_HOST: ${ORACLE_HOST:-oracle}
-  ORACLE_PORT: ${ORACLE_PORT:-1521}
   ORACLE_USER: ${ORACLE_USER:-dify}
   ORACLE_PASSWORD: ${ORACLE_PASSWORD:-dify}
-  ORACLE_DATABASE: ${ORACLE_DATABASE:-FREEPDB1}
+  ORACLE_DSN: ${ORACLE_DSN:-oracle:1521/FREEPDB1}
+  ORACLE_CONFIG_DIR: ${ORACLE_CONFIG_DIR:-/app/api/storage/wallet}
+  ORACLE_WALLET_LOCATION: ${ORACLE_WALLET_LOCATION:-/app/api/storage/wallet}
+  ORACLE_WALLET_PASSWORD: ${ORACLE_WALLET_PASSWORD:-dify}
+  ORACLE_IS_AUTONOMOUS: ${ORACLE_IS_AUTONOMOUS:-false}
   RELYT_HOST: ${RELYT_HOST:-db}
   RELYT_PORT: ${RELYT_PORT:-5432}
   RELYT_USER: ${RELYT_USER:-postgres}
@@ -209,9 +250,13 @@ x-shared-env: &shared-api-worker-env
   RELYT_DATABASE: ${RELYT_DATABASE:-postgres}
   OPENSEARCH_HOST: ${OPENSEARCH_HOST:-opensearch}
   OPENSEARCH_PORT: ${OPENSEARCH_PORT:-9200}
+  OPENSEARCH_SECURE: ${OPENSEARCH_SECURE:-true}
+  OPENSEARCH_VERIFY_CERTS: ${OPENSEARCH_VERIFY_CERTS:-true}
+  OPENSEARCH_AUTH_METHOD: ${OPENSEARCH_AUTH_METHOD:-basic}
   OPENSEARCH_USER: ${OPENSEARCH_USER:-admin}
   OPENSEARCH_PASSWORD: ${OPENSEARCH_PASSWORD:-admin}
-  OPENSEARCH_SECURE: ${OPENSEARCH_SECURE:-true}
+  OPENSEARCH_AWS_REGION: ${OPENSEARCH_AWS_REGION:-ap-southeast-1}
+  OPENSEARCH_AWS_SERVICE: ${OPENSEARCH_AWS_SERVICE:-aoss}
   TENCENT_VECTOR_DB_URL: ${TENCENT_VECTOR_DB_URL:-http://127.0.0.1}
   TENCENT_VECTOR_DB_API_KEY: ${TENCENT_VECTOR_DB_API_KEY:-dify}
   TENCENT_VECTOR_DB_TIMEOUT: ${TENCENT_VECTOR_DB_TIMEOUT:-30}
@@ -219,11 +264,20 @@ x-shared-env: &shared-api-worker-env
   TENCENT_VECTOR_DB_DATABASE: ${TENCENT_VECTOR_DB_DATABASE:-dify}
   TENCENT_VECTOR_DB_SHARD: ${TENCENT_VECTOR_DB_SHARD:-1}
   TENCENT_VECTOR_DB_REPLICAS: ${TENCENT_VECTOR_DB_REPLICAS:-2}
+  TENCENT_VECTOR_DB_ENABLE_HYBRID_SEARCH: ${TENCENT_VECTOR_DB_ENABLE_HYBRID_SEARCH:-false}
   ELASTICSEARCH_HOST: ${ELASTICSEARCH_HOST:-0.0.0.0}
   ELASTICSEARCH_PORT: ${ELASTICSEARCH_PORT:-9200}
   ELASTICSEARCH_USERNAME: ${ELASTICSEARCH_USERNAME:-elastic}
   ELASTICSEARCH_PASSWORD: ${ELASTICSEARCH_PASSWORD:-elastic}
   KIBANA_PORT: ${KIBANA_PORT:-5601}
+  ELASTICSEARCH_USE_CLOUD: ${ELASTICSEARCH_USE_CLOUD:-false}
+  ELASTICSEARCH_CLOUD_URL: ${ELASTICSEARCH_CLOUD_URL:-YOUR-ELASTICSEARCH_CLOUD_URL}
+  ELASTICSEARCH_API_KEY: ${ELASTICSEARCH_API_KEY:-YOUR-ELASTICSEARCH_API_KEY}
+  ELASTICSEARCH_VERIFY_CERTS: ${ELASTICSEARCH_VERIFY_CERTS:-False}
+  ELASTICSEARCH_CA_CERTS: ${ELASTICSEARCH_CA_CERTS:-}
+  ELASTICSEARCH_REQUEST_TIMEOUT: ${ELASTICSEARCH_REQUEST_TIMEOUT:-100000}
+  ELASTICSEARCH_RETRY_ON_TIMEOUT: ${ELASTICSEARCH_RETRY_ON_TIMEOUT:-True}
+  ELASTICSEARCH_MAX_RETRIES: ${ELASTICSEARCH_MAX_RETRIES:-10}
   BAIDU_VECTOR_DB_ENDPOINT: ${BAIDU_VECTOR_DB_ENDPOINT:-http://127.0.0.1:5287}
   BAIDU_VECTOR_DB_CONNECTION_TIMEOUT_MS: ${BAIDU_VECTOR_DB_CONNECTION_TIMEOUT_MS:-30000}
   BAIDU_VECTOR_DB_ACCOUNT: ${BAIDU_VECTOR_DB_ACCOUNT:-root}
@@ -241,6 +295,7 @@ x-shared-env: &shared-api-worker-env
   LINDORM_URL: ${LINDORM_URL:-http://lindorm:30070}
   LINDORM_USERNAME: ${LINDORM_USERNAME:-lindorm}
   LINDORM_PASSWORD: ${LINDORM_PASSWORD:-lindorm}
+  LINDORM_QUERY_TIMEOUT: ${LINDORM_QUERY_TIMEOUT:-1}
   OCEANBASE_VECTOR_HOST: ${OCEANBASE_VECTOR_HOST:-oceanbase}
   OCEANBASE_VECTOR_PORT: ${OCEANBASE_VECTOR_PORT:-2881}
   OCEANBASE_VECTOR_USER: ${OCEANBASE_VECTOR_USER:-root@test}
@@ -248,8 +303,37 @@ x-shared-env: &shared-api-worker-env
   OCEANBASE_VECTOR_DATABASE: ${OCEANBASE_VECTOR_DATABASE:-test}
   OCEANBASE_CLUSTER_NAME: ${OCEANBASE_CLUSTER_NAME:-difyai}
   OCEANBASE_MEMORY_LIMIT: ${OCEANBASE_MEMORY_LIMIT:-6G}
+  OCEANBASE_ENABLE_HYBRID_SEARCH: ${OCEANBASE_ENABLE_HYBRID_SEARCH:-false}
+  OPENGAUSS_HOST: ${OPENGAUSS_HOST:-opengauss}
+  OPENGAUSS_PORT: ${OPENGAUSS_PORT:-6600}
+  OPENGAUSS_USER: ${OPENGAUSS_USER:-postgres}
+  OPENGAUSS_PASSWORD: ${OPENGAUSS_PASSWORD:-Dify@123}
+  OPENGAUSS_DATABASE: ${OPENGAUSS_DATABASE:-dify}
+  OPENGAUSS_MIN_CONNECTION: ${OPENGAUSS_MIN_CONNECTION:-1}
+  OPENGAUSS_MAX_CONNECTION: ${OPENGAUSS_MAX_CONNECTION:-5}
+  OPENGAUSS_ENABLE_PQ: ${OPENGAUSS_ENABLE_PQ:-false}
+  HUAWEI_CLOUD_HOSTS: ${HUAWEI_CLOUD_HOSTS:-https://127.0.0.1:9200}
+  HUAWEI_CLOUD_USER: ${HUAWEI_CLOUD_USER:-admin}
+  HUAWEI_CLOUD_PASSWORD: ${HUAWEI_CLOUD_PASSWORD:-admin}
   UPSTASH_VECTOR_URL: ${UPSTASH_VECTOR_URL:-https://xxx-vector.upstash.io}
   UPSTASH_VECTOR_TOKEN: ${UPSTASH_VECTOR_TOKEN:-dify}
+  TABLESTORE_ENDPOINT: ${TABLESTORE_ENDPOINT:-https://instance-name.cn-hangzhou.ots.aliyuncs.com}
+  TABLESTORE_INSTANCE_NAME: ${TABLESTORE_INSTANCE_NAME:-instance-name}
+  TABLESTORE_ACCESS_KEY_ID: ${TABLESTORE_ACCESS_KEY_ID:-xxx}
+  TABLESTORE_ACCESS_KEY_SECRET: ${TABLESTORE_ACCESS_KEY_SECRET:-xxx}
+  TABLESTORE_NORMALIZE_FULLTEXT_BM25_SCORE: ${TABLESTORE_NORMALIZE_FULLTEXT_BM25_SCORE:-false}
+  CLICKZETTA_USERNAME: ${CLICKZETTA_USERNAME:-}
+  CLICKZETTA_PASSWORD: ${CLICKZETTA_PASSWORD:-}
+  CLICKZETTA_INSTANCE: ${CLICKZETTA_INSTANCE:-}
+  CLICKZETTA_SERVICE: ${CLICKZETTA_SERVICE:-api.clickzetta.com}
+  CLICKZETTA_WORKSPACE: ${CLICKZETTA_WORKSPACE:-quick_start}
+  CLICKZETTA_VCLUSTER: ${CLICKZETTA_VCLUSTER:-default_ap}
+  CLICKZETTA_SCHEMA: ${CLICKZETTA_SCHEMA:-dify}
+  CLICKZETTA_BATCH_SIZE: ${CLICKZETTA_BATCH_SIZE:-100}
+  CLICKZETTA_ENABLE_INVERTED_INDEX: ${CLICKZETTA_ENABLE_INVERTED_INDEX:-true}
+  CLICKZETTA_ANALYZER_TYPE: ${CLICKZETTA_ANALYZER_TYPE:-chinese}
+  CLICKZETTA_ANALYZER_MODE: ${CLICKZETTA_ANALYZER_MODE:-smart}
+  CLICKZETTA_VECTOR_DISTANCE_FUNCTION: ${CLICKZETTA_VECTOR_DISTANCE_FUNCTION:-cosine_distance}
   UPLOAD_FILE_SIZE_LIMIT: ${UPLOAD_FILE_SIZE_LIMIT:-15}
   UPLOAD_FILE_BATCH_LIMIT: ${UPLOAD_FILE_BATCH_LIMIT:-5}
   ETL_TYPE: ${ETL_TYPE:-dify}
@@ -258,6 +342,7 @@ x-shared-env: &shared-api-worker-env
   SCARF_NO_ANALYTICS: ${SCARF_NO_ANALYTICS:-true}
   PROMPT_GENERATION_MAX_TOKENS: ${PROMPT_GENERATION_MAX_TOKENS:-512}
   CODE_GENERATION_MAX_TOKENS: ${CODE_GENERATION_MAX_TOKENS:-1024}
+  PLUGIN_BASED_TOKEN_COUNTING_ENABLED: ${PLUGIN_BASED_TOKEN_COUNTING_ENABLED:-false}
   MULTIMODAL_SEND_FORMAT: ${MULTIMODAL_SEND_FORMAT:-base64}
   UPLOAD_IMAGE_FILE_SIZE_LIMIT: ${UPLOAD_IMAGE_FILE_SIZE_LIMIT:-10}
   UPLOAD_VIDEO_FILE_SIZE_LIMIT: ${UPLOAD_VIDEO_FILE_SIZE_LIMIT:-100}
@@ -267,6 +352,8 @@ x-shared-env: &shared-api-worker-env
   API_SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
   API_SENTRY_PROFILES_SAMPLE_RATE: ${API_SENTRY_PROFILES_SAMPLE_RATE:-1.0}
   WEB_SENTRY_DSN: ${WEB_SENTRY_DSN:-}
+  PLUGIN_SENTRY_ENABLED: ${PLUGIN_SENTRY_ENABLED:-false}
+  PLUGIN_SENTRY_DSN: ${PLUGIN_SENTRY_DSN:-}
   NOTION_INTEGRATION_TYPE: ${NOTION_INTEGRATION_TYPE:-public}
   NOTION_CLIENT_SECRET: ${NOTION_CLIENT_SECRET:-}
   NOTION_CLIENT_ID: ${NOTION_CLIENT_ID:-}
@@ -281,9 +368,12 @@ x-shared-env: &shared-api-worker-env
   SMTP_PASSWORD: ${SMTP_PASSWORD:-}
   SMTP_USE_TLS: ${SMTP_USE_TLS:-true}
   SMTP_OPPORTUNISTIC_TLS: ${SMTP_OPPORTUNISTIC_TLS:-false}
+  SENDGRID_API_KEY: ${SENDGRID_API_KEY:-}
   INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-4000}
   INVITE_EXPIRY_HOURS: ${INVITE_EXPIRY_HOURS:-72}
   RESET_PASSWORD_TOKEN_EXPIRY_MINUTES: ${RESET_PASSWORD_TOKEN_EXPIRY_MINUTES:-5}
+  CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES: ${CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES:-5}
+  OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES: ${OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES:-5}
   CODE_EXECUTION_ENDPOINT: ${CODE_EXECUTION_ENDPOINT:-http://sandbox:8194}
   CODE_EXECUTION_API_KEY: ${CODE_EXECUTION_API_KEY:-dify-sandbox}
   CODE_MAX_NUMBER: ${CODE_MAX_NUMBER:-9223372036854775807}
@@ -304,12 +394,28 @@ x-shared-env: &shared-api-worker-env
   MAX_VARIABLE_SIZE: ${MAX_VARIABLE_SIZE:-204800}
   WORKFLOW_PARALLEL_DEPTH_LIMIT: ${WORKFLOW_PARALLEL_DEPTH_LIMIT:-3}
   WORKFLOW_FILE_UPLOAD_LIMIT: ${WORKFLOW_FILE_UPLOAD_LIMIT:-10}
+  WORKFLOW_NODE_EXECUTION_STORAGE: ${WORKFLOW_NODE_EXECUTION_STORAGE:-rdbms}
+  CORE_WORKFLOW_EXECUTION_REPOSITORY: ${CORE_WORKFLOW_EXECUTION_REPOSITORY:-core.repositories.sqlalchemy_workflow_execution_repository.SQLAlchemyWorkflowExecutionRepository}
+  CORE_WORKFLOW_NODE_EXECUTION_REPOSITORY: ${CORE_WORKFLOW_NODE_EXECUTION_REPOSITORY:-core.repositories.sqlalchemy_workflow_node_execution_repository.SQLAlchemyWorkflowNodeExecutionRepository}
+  API_WORKFLOW_RUN_REPOSITORY: ${API_WORKFLOW_RUN_REPOSITORY:-repositories.sqlalchemy_api_workflow_run_repository.DifyAPISQLAlchemyWorkflowRunRepository}
+  API_WORKFLOW_NODE_EXECUTION_REPOSITORY: ${API_WORKFLOW_NODE_EXECUTION_REPOSITORY:-repositories.sqlalchemy_api_workflow_node_execution_repository.DifyAPISQLAlchemyWorkflowNodeExecutionRepository}
+  WORKFLOW_LOG_CLEANUP_ENABLED: ${WORKFLOW_LOG_CLEANUP_ENABLED:-false}
+  WORKFLOW_LOG_RETENTION_DAYS: ${WORKFLOW_LOG_RETENTION_DAYS:-30}
+  WORKFLOW_LOG_CLEANUP_BATCH_SIZE: ${WORKFLOW_LOG_CLEANUP_BATCH_SIZE:-100}
   HTTP_REQUEST_NODE_MAX_BINARY_SIZE: ${HTTP_REQUEST_NODE_MAX_BINARY_SIZE:-10485760}
   HTTP_REQUEST_NODE_MAX_TEXT_SIZE: ${HTTP_REQUEST_NODE_MAX_TEXT_SIZE:-1048576}
+  HTTP_REQUEST_NODE_SSL_VERIFY: ${HTTP_REQUEST_NODE_SSL_VERIFY:-True}
+  RESPECT_XFORWARD_HEADERS_ENABLED: ${RESPECT_XFORWARD_HEADERS_ENABLED:-false}
   SSRF_PROXY_HTTP_URL: ${SSRF_PROXY_HTTP_URL:-http://ssrf_proxy:3128}
   SSRF_PROXY_HTTPS_URL: ${SSRF_PROXY_HTTPS_URL:-http://ssrf_proxy:3128}
+  LOOP_NODE_MAX_COUNT: ${LOOP_NODE_MAX_COUNT:-100}
+  MAX_TOOLS_NUM: ${MAX_TOOLS_NUM:-10}
+  MAX_PARALLEL_LIMIT: ${MAX_PARALLEL_LIMIT:-10}
+  MAX_ITERATIONS_NUM: ${MAX_ITERATIONS_NUM:-99}
   TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}
-  PGUSER: ${PGUSER:-${DB_USERNAME}}
+  ALLOW_UNSAFE_DATA_SCHEME: ${ALLOW_UNSAFE_DATA_SCHEME:-false}
+  MAX_TREE_DEPTH: ${MAX_TREE_DEPTH:-50}
+  POSTGRES_USER: ${POSTGRES_USER:-${DB_USERNAME}}
   POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-${DB_PASSWORD}}
   POSTGRES_DB: ${POSTGRES_DB:-${DB_DATABASE}}
   PGDATA: ${PGDATA:-/var/lib/postgresql/data/pgdata}
@@ -365,7 +471,7 @@ x-shared-env: &shared-api-worker-env
   NGINX_SSL_CERT_KEY_FILENAME: ${NGINX_SSL_CERT_KEY_FILENAME:-dify.key}
   NGINX_SSL_PROTOCOLS: ${NGINX_SSL_PROTOCOLS:-TLSv1.1 TLSv1.2 TLSv1.3}
   NGINX_WORKER_PROCESSES: ${NGINX_WORKER_PROCESSES:-auto}
-  NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-15M}
+  NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-100M}
   NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-65}
   NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600s}
   NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600s}
@@ -377,6 +483,10 @@ x-shared-env: &shared-api-worker-env
   SSRF_COREDUMP_DIR: ${SSRF_COREDUMP_DIR:-/var/spool/squid}
   SSRF_REVERSE_PROXY_PORT: ${SSRF_REVERSE_PROXY_PORT:-8194}
   SSRF_SANDBOX_HOST: ${SSRF_SANDBOX_HOST:-sandbox}
+  SSRF_DEFAULT_TIME_OUT: ${SSRF_DEFAULT_TIME_OUT:-5}
+  SSRF_DEFAULT_CONNECT_TIME_OUT: ${SSRF_DEFAULT_CONNECT_TIME_OUT:-5}
+  SSRF_DEFAULT_READ_TIME_OUT: ${SSRF_DEFAULT_READ_TIME_OUT:-5}
+  SSRF_DEFAULT_WRITE_TIME_OUT: ${SSRF_DEFAULT_WRITE_TIME_OUT:-5}
   EXPOSE_NGINX_PORT: ${EXPOSE_NGINX_PORT:-80}
   EXPOSE_NGINX_SSL_PORT: ${EXPOSE_NGINX_SSL_PORT:-443}
   POSITION_TOOL_PINS: ${POSITION_TOOL_PINS:-}
@@ -389,11 +499,90 @@ x-shared-env: &shared-api-worker-env
   CREATE_TIDB_SERVICE_JOB_ENABLED: ${CREATE_TIDB_SERVICE_JOB_ENABLED:-false}
   MAX_SUBMIT_COUNT: ${MAX_SUBMIT_COUNT:-100}
   TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-10}
+  DB_PLUGIN_DATABASE: ${DB_PLUGIN_DATABASE:-dify_plugin}
+  EXPOSE_PLUGIN_DAEMON_PORT: ${EXPOSE_PLUGIN_DAEMON_PORT:-5002}
+  PLUGIN_DAEMON_PORT: ${PLUGIN_DAEMON_PORT:-5002}
+  PLUGIN_DAEMON_KEY: ${PLUGIN_DAEMON_KEY:-lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi}
+  PLUGIN_DAEMON_URL: ${PLUGIN_DAEMON_URL:-http://plugin_daemon:5002}
+  PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
+  PLUGIN_PPROF_ENABLED: ${PLUGIN_PPROF_ENABLED:-false}
+  PLUGIN_DEBUGGING_HOST: ${PLUGIN_DEBUGGING_HOST:-0.0.0.0}
+  PLUGIN_DEBUGGING_PORT: ${PLUGIN_DEBUGGING_PORT:-5003}
+  EXPOSE_PLUGIN_DEBUGGING_HOST: ${EXPOSE_PLUGIN_DEBUGGING_HOST:-localhost}
+  EXPOSE_PLUGIN_DEBUGGING_PORT: ${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}
+  PLUGIN_DIFY_INNER_API_KEY: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
+  PLUGIN_DIFY_INNER_API_URL: ${PLUGIN_DIFY_INNER_API_URL:-http://api:5001}
+  ENDPOINT_URL_TEMPLATE: ${ENDPOINT_URL_TEMPLATE:-http://localhost/e/{hook_id}}
+  MARKETPLACE_ENABLED: ${MARKETPLACE_ENABLED:-true}
+  MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
+  FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true}
+  PLUGIN_STDIO_BUFFER_SIZE: ${PLUGIN_STDIO_BUFFER_SIZE:-1024}
+  PLUGIN_STDIO_MAX_BUFFER_SIZE: ${PLUGIN_STDIO_MAX_BUFFER_SIZE:-5242880}
+  PLUGIN_PYTHON_ENV_INIT_TIMEOUT: ${PLUGIN_PYTHON_ENV_INIT_TIMEOUT:-120}
+  PLUGIN_MAX_EXECUTION_TIMEOUT: ${PLUGIN_MAX_EXECUTION_TIMEOUT:-600}
+  PIP_MIRROR_URL: ${PIP_MIRROR_URL:-}
+  PLUGIN_STORAGE_TYPE: ${PLUGIN_STORAGE_TYPE:-local}
+  PLUGIN_STORAGE_LOCAL_ROOT: ${PLUGIN_STORAGE_LOCAL_ROOT:-/app/storage}
+  PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd}
+  PLUGIN_INSTALLED_PATH: ${PLUGIN_INSTALLED_PATH:-plugin}
+  PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
+  PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
+  PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
+  PLUGIN_S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false}
+  PLUGIN_S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
+  PLUGIN_S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
+  PLUGIN_S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
+  PLUGIN_AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
+  PLUGIN_AWS_SECRET_KEY: ${PLUGIN_AWS_SECRET_KEY:-}
+  PLUGIN_AWS_REGION: ${PLUGIN_AWS_REGION:-}
+  PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME: ${PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME:-}
+  PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING: ${PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING:-}
+  PLUGIN_TENCENT_COS_SECRET_KEY: ${PLUGIN_TENCENT_COS_SECRET_KEY:-}
+  PLUGIN_TENCENT_COS_SECRET_ID: ${PLUGIN_TENCENT_COS_SECRET_ID:-}
+  PLUGIN_TENCENT_COS_REGION: ${PLUGIN_TENCENT_COS_REGION:-}
+  PLUGIN_ALIYUN_OSS_REGION: ${PLUGIN_ALIYUN_OSS_REGION:-}
+  PLUGIN_ALIYUN_OSS_ENDPOINT: ${PLUGIN_ALIYUN_OSS_ENDPOINT:-}
+  PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID:-}
+  PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET:-}
+  PLUGIN_ALIYUN_OSS_AUTH_VERSION: ${PLUGIN_ALIYUN_OSS_AUTH_VERSION:-v4}
+  PLUGIN_ALIYUN_OSS_PATH: ${PLUGIN_ALIYUN_OSS_PATH:-}
+  PLUGIN_VOLCENGINE_TOS_ENDPOINT: ${PLUGIN_VOLCENGINE_TOS_ENDPOINT:-}
+  PLUGIN_VOLCENGINE_TOS_ACCESS_KEY: ${PLUGIN_VOLCENGINE_TOS_ACCESS_KEY:-}
+  PLUGIN_VOLCENGINE_TOS_SECRET_KEY: ${PLUGIN_VOLCENGINE_TOS_SECRET_KEY:-}
+  PLUGIN_VOLCENGINE_TOS_REGION: ${PLUGIN_VOLCENGINE_TOS_REGION:-}
+  ENABLE_OTEL: ${ENABLE_OTEL:-false}
+  OTLP_TRACE_ENDPOINT: ${OTLP_TRACE_ENDPOINT:-}
+  OTLP_METRIC_ENDPOINT: ${OTLP_METRIC_ENDPOINT:-}
+  OTLP_BASE_ENDPOINT: ${OTLP_BASE_ENDPOINT:-http://localhost:4318}
+  OTLP_API_KEY: ${OTLP_API_KEY:-}
+  OTEL_EXPORTER_OTLP_PROTOCOL: ${OTEL_EXPORTER_OTLP_PROTOCOL:-}
+  OTEL_EXPORTER_TYPE: ${OTEL_EXPORTER_TYPE:-otlp}
+  OTEL_SAMPLING_RATE: ${OTEL_SAMPLING_RATE:-0.1}
+  OTEL_BATCH_EXPORT_SCHEDULE_DELAY: ${OTEL_BATCH_EXPORT_SCHEDULE_DELAY:-5000}
+  OTEL_MAX_QUEUE_SIZE: ${OTEL_MAX_QUEUE_SIZE:-2048}
+  OTEL_MAX_EXPORT_BATCH_SIZE: ${OTEL_MAX_EXPORT_BATCH_SIZE:-512}
+  OTEL_METRIC_EXPORT_INTERVAL: ${OTEL_METRIC_EXPORT_INTERVAL:-60000}
+  OTEL_BATCH_EXPORT_TIMEOUT: ${OTEL_BATCH_EXPORT_TIMEOUT:-10000}
+  OTEL_METRIC_EXPORT_TIMEOUT: ${OTEL_METRIC_EXPORT_TIMEOUT:-30000}
+  ALLOW_EMBED: ${ALLOW_EMBED:-false}
+  QUEUE_MONITOR_THRESHOLD: ${QUEUE_MONITOR_THRESHOLD:-200}
+  QUEUE_MONITOR_ALERT_EMAILS: ${QUEUE_MONITOR_ALERT_EMAILS:-}
+  QUEUE_MONITOR_INTERVAL: ${QUEUE_MONITOR_INTERVAL:-30}
+  SWAGGER_UI_ENABLED: ${SWAGGER_UI_ENABLED:-true}
+  SWAGGER_UI_PATH: ${SWAGGER_UI_PATH:-/swagger-ui.html}
+  ENABLE_CLEAN_EMBEDDING_CACHE_TASK: ${ENABLE_CLEAN_EMBEDDING_CACHE_TASK:-false}
+  ENABLE_CLEAN_UNUSED_DATASETS_TASK: ${ENABLE_CLEAN_UNUSED_DATASETS_TASK:-false}
+  ENABLE_CREATE_TIDB_SERVERLESS_TASK: ${ENABLE_CREATE_TIDB_SERVERLESS_TASK:-false}
+  ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK: ${ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK:-false}
+  ENABLE_CLEAN_MESSAGES: ${ENABLE_CLEAN_MESSAGES:-false}
+  ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK: ${ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK:-false}
+  ENABLE_DATASETS_QUEUE_MONITOR: ${ENABLE_DATASETS_QUEUE_MONITOR:-false}
+  ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK: ${ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK:-true}
 
 services:
   # API service
   api:
-    image: langgenius/dify-api:0.15.2
+    image: langgenius/dify-api:1.8.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -403,9 +592,15 @@ services:
       SENTRY_DSN: ${API_SENTRY_DSN:-}
       SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
       SENTRY_PROFILES_SAMPLE_RATE: ${API_SENTRY_PROFILES_SAMPLE_RATE:-1.0}
+      PLUGIN_REMOTE_INSTALL_HOST: ${EXPOSE_PLUGIN_DEBUGGING_HOST:-localhost}
+      PLUGIN_REMOTE_INSTALL_PORT: ${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}
+      PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
+      INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
     depends_on:
-      - db
-      - redis
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_started
     volumes:
       # Mount the storage directory to the container, for storing user files.
       - ./volumes/app/storage:/app/api/storage
@@ -416,7 +611,7 @@ services:
   # worker service
   # The Celery worker for processing the queue.
   worker:
-    image: langgenius/dify-api:0.15.2
+    image: langgenius/dify-api:1.8.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -426,9 +621,13 @@ services:
       SENTRY_DSN: ${API_SENTRY_DSN:-}
       SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
       SENTRY_PROFILES_SAMPLE_RATE: ${API_SENTRY_PROFILES_SAMPLE_RATE:-1.0}
+      PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
+      INNER_API_KEY_FOR_PLUGIN: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
     depends_on:
-      - db
-      - redis
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_started
     volumes:
       # Mount the storage directory to the container, for storing user files.
       - ./volumes/app/storage:/app/api/storage
@@ -436,9 +635,28 @@ services:
       - ssrf_proxy_network
       - default
 
+  # worker_beat service
+  # Celery beat for scheduling periodic tasks.
+  worker_beat:
+    image: langgenius/dify-api:1.8.0
+    restart: always
+    environment:
+      # Use the shared environment variables.
+      <<: *shared-api-worker-env
+      # Startup mode, 'worker_beat' starts the Celery beat for scheduling periodic tasks.
+      MODE: beat
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_started
+    networks:
+      - ssrf_proxy_network
+      - default
+
   # Frontend web application.
   web:
-    image: langgenius/dify-web:0.15.2
+    image: langgenius/dify-web:1.8.0
     restart: always
     environment:
       CONSOLE_API_URL: ${CONSOLE_API_URL:-}
@@ -447,15 +665,27 @@ services:
       NEXT_TELEMETRY_DISABLED: ${NEXT_TELEMETRY_DISABLED:-0}
       TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}
       CSP_WHITELIST: ${CSP_WHITELIST:-}
+      ALLOW_EMBED: ${ALLOW_EMBED:-false}
+      ALLOW_UNSAFE_DATA_SCHEME: ${ALLOW_UNSAFE_DATA_SCHEME:-false}
+      MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
+      MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace.dify.ai}
       TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-}
       INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-}
-
+      PM2_INSTANCES: ${PM2_INSTANCES:-2}
+      LOOP_NODE_MAX_COUNT: ${LOOP_NODE_MAX_COUNT:-100}
+      MAX_TOOLS_NUM: ${MAX_TOOLS_NUM:-10}
+      MAX_PARALLEL_LIMIT: ${MAX_PARALLEL_LIMIT:-10}
+      MAX_ITERATIONS_NUM: ${MAX_ITERATIONS_NUM:-99}
+      MAX_TREE_DEPTH: ${MAX_TREE_DEPTH:-50}
+      ENABLE_WEBSITE_JINAREADER: ${ENABLE_WEBSITE_JINAREADER:-true}
+      ENABLE_WEBSITE_FIRECRAWL: ${ENABLE_WEBSITE_FIRECRAWL:-true}
+      ENABLE_WEBSITE_WATERCRAWL: ${ENABLE_WEBSITE_WATERCRAWL:-true}
   # The postgres database.
   db:
     image: postgres:15-alpine
     restart: always
     environment:
-      PGUSER: ${PGUSER:-postgres}
+      POSTGRES_USER: ${POSTGRES_USER:-postgres}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-difyai123456}
       POSTGRES_DB: ${POSTGRES_DB:-dify}
       PGDATA: ${PGDATA:-/var/lib/postgresql/data/pgdata}
@@ -468,10 +698,20 @@ services:
     volumes:
       - ./volumes/db/data:/var/lib/postgresql/data
     healthcheck:
-      test: [ 'CMD', 'pg_isready' ]
+      test:
+        [
+          'CMD',
+          'pg_isready',
+          '-h',
+          'db',
+          '-U',
+          '${PGUSER:-postgres}',
+          '-d',
+          '${POSTGRES_DB:-dify}'
+        ]
       interval: 1s
       timeout: 3s
-      retries: 30
+      retries: 60
 
   # The redis cache.
   redis:
@@ -489,7 +729,7 @@ services:
 
   # The DifySandbox
   sandbox:
-    image: langgenius/dify-sandbox:0.2.10
+    image: langgenius/dify-sandbox:0.2.12
     restart: always
     environment:
       # The DifySandbox configurations
@@ -502,16 +742,77 @@ services:
       HTTP_PROXY: ${SANDBOX_HTTP_PROXY:-http://ssrf_proxy:3128}
       HTTPS_PROXY: ${SANDBOX_HTTPS_PROXY:-http://ssrf_proxy:3128}
       SANDBOX_PORT: ${SANDBOX_PORT:-8194}
+      PIP_MIRROR_URL: ${PIP_MIRROR_URL:-}
     volumes:
       - ./volumes/sandbox/dependencies:/dependencies
+      - ./volumes/sandbox/conf:/conf
     healthcheck:
       test: [ 'CMD', 'curl', '-f', 'http://localhost:8194/health' ]
     networks:
       - ssrf_proxy_network
 
+  # plugin daemon
+  plugin_daemon:
+    image: langgenius/dify-plugin-daemon:0.2.0-local
+    restart: always
+    environment:
+      # Use the shared environment variables.
+      <<: *shared-api-worker-env
+      DB_DATABASE: ${DB_PLUGIN_DATABASE:-dify_plugin}
+      SERVER_PORT: ${PLUGIN_DAEMON_PORT:-5002}
+      SERVER_KEY: ${PLUGIN_DAEMON_KEY:-lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi}
+      MAX_PLUGIN_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
+      PPROF_ENABLED: ${PLUGIN_PPROF_ENABLED:-false}
+      DIFY_INNER_API_URL: ${PLUGIN_DIFY_INNER_API_URL:-http://api:5001}
+      DIFY_INNER_API_KEY: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
+      PLUGIN_REMOTE_INSTALLING_HOST: ${PLUGIN_DEBUGGING_HOST:-0.0.0.0}
+      PLUGIN_REMOTE_INSTALLING_PORT: ${PLUGIN_DEBUGGING_PORT:-5003}
+      PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd}
+      FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true}
+      PYTHON_ENV_INIT_TIMEOUT: ${PLUGIN_PYTHON_ENV_INIT_TIMEOUT:-120}
+      PLUGIN_MAX_EXECUTION_TIMEOUT: ${PLUGIN_MAX_EXECUTION_TIMEOUT:-600}
+      PLUGIN_STDIO_BUFFER_SIZE: ${PLUGIN_STDIO_BUFFER_SIZE:-1024}
+      PLUGIN_STDIO_MAX_BUFFER_SIZE: ${PLUGIN_STDIO_MAX_BUFFER_SIZE:-5242880}
+      PIP_MIRROR_URL: ${PIP_MIRROR_URL:-}
+      PLUGIN_STORAGE_TYPE: ${PLUGIN_STORAGE_TYPE:-local}
+      PLUGIN_STORAGE_LOCAL_ROOT: ${PLUGIN_STORAGE_LOCAL_ROOT:-/app/storage}
+      PLUGIN_INSTALLED_PATH: ${PLUGIN_INSTALLED_PATH:-plugin}
+      PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
+      PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
+      PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
+      S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
+      S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false}
+      S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
+      S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
+      AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
+      AWS_SECRET_KEY: ${PLUGIN_AWS_SECRET_KEY:-}
+      AWS_REGION: ${PLUGIN_AWS_REGION:-}
+      AZURE_BLOB_STORAGE_CONNECTION_STRING: ${PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING:-}
+      AZURE_BLOB_STORAGE_CONTAINER_NAME: ${PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME:-}
+      TENCENT_COS_SECRET_KEY: ${PLUGIN_TENCENT_COS_SECRET_KEY:-}
+      TENCENT_COS_SECRET_ID: ${PLUGIN_TENCENT_COS_SECRET_ID:-}
+      TENCENT_COS_REGION: ${PLUGIN_TENCENT_COS_REGION:-}
+      ALIYUN_OSS_REGION: ${PLUGIN_ALIYUN_OSS_REGION:-}
+      ALIYUN_OSS_ENDPOINT: ${PLUGIN_ALIYUN_OSS_ENDPOINT:-}
+      ALIYUN_OSS_ACCESS_KEY_ID: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID:-}
+      ALIYUN_OSS_ACCESS_KEY_SECRET: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET:-}
+      ALIYUN_OSS_AUTH_VERSION: ${PLUGIN_ALIYUN_OSS_AUTH_VERSION:-v4}
+      ALIYUN_OSS_PATH: ${PLUGIN_ALIYUN_OSS_PATH:-}
+      VOLCENGINE_TOS_ENDPOINT: ${PLUGIN_VOLCENGINE_TOS_ENDPOINT:-}
+      VOLCENGINE_TOS_ACCESS_KEY: ${PLUGIN_VOLCENGINE_TOS_ACCESS_KEY:-}
+      VOLCENGINE_TOS_SECRET_KEY: ${PLUGIN_VOLCENGINE_TOS_SECRET_KEY:-}
+      VOLCENGINE_TOS_REGION: ${PLUGIN_VOLCENGINE_TOS_REGION:-}
+      SENTRY_ENABLED: ${PLUGIN_SENTRY_ENABLED:-false}
+      SENTRY_DSN: ${PLUGIN_SENTRY_DSN:-}
+    volumes:
+      - ./volumes/plugin_daemon:/app/storage
+    depends_on:
+      db:
+        condition: service_healthy
+
   # ssrf_proxy server
   # for more information, please refer to
-  # https://docs.dify.ai/learn-more/faq/install-faq#id-18.-why-is-ssrf_proxy-needed
+  # https://docs.dify.ai/learn-more/faq/install-faq#18-why-is-ssrf-proxy-needed%3F
   ssrf_proxy:
     image: ubuntu/squid:latest
     restart: always
@@ -591,7 +892,7 @@ services:
       NGINX_SSL_CERT_KEY_FILENAME: ${NGINX_SSL_CERT_KEY_FILENAME:-dify.key}
       NGINX_SSL_PROTOCOLS: ${NGINX_SSL_PROTOCOLS:-TLSv1.1 TLSv1.2 TLSv1.3}
       NGINX_WORKER_PROCESSES: ${NGINX_WORKER_PROCESSES:-auto}
-      NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-15M}
+      NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-100M}
       NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-65}
       NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600s}
       NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600s}
@@ -601,16 +902,6 @@ services:
       - api
       - web
 
-  # The TiDB vector store.
-  # For production use, please refer to https://github.com/pingcap/tidb-docker-compose
-  tidb:
-    image: pingcap/tidb:v8.4.0
-    profiles:
-      - tidb
-    command:
-      - --store=unistore
-    restart: always
-
   # The Weaviate vector store.
   weaviate:
     image: semitechnologies/weaviate:1.19.0
@@ -699,8 +990,35 @@ services:
       POSTGRES_DB: ${PGVECTOR_POSTGRES_DB:-dify}
       # postgres data directory
       PGDATA: ${PGVECTOR_PGDATA:-/var/lib/postgresql/data/pgdata}
+      # pg_bigm module for full text search
+      PG_BIGM: ${PGVECTOR_PG_BIGM:-false}
+      PG_BIGM_VERSION: ${PGVECTOR_PG_BIGM_VERSION:-1.2-20240606}
     volumes:
       - ./volumes/pgvector/data:/var/lib/postgresql/data
+      - ./pgvector/docker-entrypoint.sh:/docker-entrypoint.sh
+    entrypoint: [ '/docker-entrypoint.sh' ]
+    healthcheck:
+      test: [ 'CMD', 'pg_isready' ]
+      interval: 1s
+      timeout: 3s
+      retries: 30
+
+  # get image from https://www.vastdata.com.cn/
+  vastbase:
+    image: vastdata/vastbase-vector
+    profiles:
+      - vastbase
+    restart: always
+    environment:
+      - VB_DBCOMPATIBILITY=PG
+      - VB_DB=dify
+      - VB_USERNAME=dify
+      - VB_PASSWORD=Difyai123456
+    volumes:
+      - ./vastbase/lic:/home/vastbase/vastbase/lic
+      - ./vastbase/data:/home/vastbase/data
+      - ./vastbase/backup:/home/vastbase/backup
+      - ./vastbase/backup_log:/home/vastbase/backup_log
     healthcheck:
       test: [ 'CMD', 'pg_isready' ]
       interval: 1s
@@ -744,7 +1062,7 @@ services:
 
   # OceanBase vector database
   oceanbase:
-    image: quay.io/oceanbase/oceanbase-ce:4.3.3.0-100000142024101215
+    image: oceanbase/oceanbase-ce:4.3.5-lts
     profiles:
       - oceanbase
     restart: always
@@ -757,7 +1075,19 @@ services:
       OB_SYS_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
       OB_TENANT_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
       OB_CLUSTER_NAME: ${OCEANBASE_CLUSTER_NAME:-difyai}
-      OB_SERVER_IP: '127.0.0.1'
+      OB_SERVER_IP: 127.0.0.1
+      MODE: mini
+    healthcheck:
+      test:
+        [
+          'CMD-SHELL',
+          'obclient -h127.0.0.1 -P2881 -uroot@test -p$${OB_TENANT_PASSWORD} -e
+            "SELECT 1;"'
+        ]
+      interval: 10s
+      retries: 30
+      start_period: 30s
+      timeout: 10s
 
   # Oracle vector database
   oracle:
@@ -815,7 +1145,7 @@ services:
       - milvus
 
   milvus-standalone:
-    image: milvusdb/milvus:v2.5.0-beta
+    image: milvusdb/milvus:v2.5.15
     profiles:
       - milvus
     command: [ 'milvus', 'run', 'standalone' ]
@@ -873,6 +1203,26 @@ services:
     depends_on:
       - opensearch
 
+  # opengauss vector database.
+  opengauss:
+    image: opengauss/opengauss:7.0.0-RC1
+    profiles:
+      - opengauss
+    privileged: true
+    restart: always
+    environment:
+      GS_USERNAME: ${OPENGAUSS_USER:-postgres}
+      GS_PASSWORD: ${OPENGAUSS_PASSWORD:-Dify@123}
+      GS_PORT: ${OPENGAUSS_PORT:-6600}
+      GS_DB: ${OPENGAUSS_DATABASE:-dify}
+    volumes:
+      - ./volumes/opengauss/data:/var/lib/opengauss/data
+    healthcheck:
+      test: [ "CMD-SHELL", "netstat -lntp | grep tcp6 > /dev/null 2>&1" ]
+      interval: 10s
+      timeout: 10s
+      retries: 10
+
   # MyScale vector database
   myscale:
     image: myscale/myscaledb:1.6.4
@@ -885,6 +1235,16 @@ services:
       - ./volumes/myscale/log:/var/log/clickhouse-server
       - ./volumes/myscale/config/users.d/custom_users_config.xml:/etc/clickhouse-server/users.d/custom_users_config.xml
 
+  # Matrixone vector store.
+  matrixone:
+    hostname: matrixone
+    image: matrixorigin/matrixone:2.1.1
+    profiles:
+      - matrixone
+    restart: always
+    volumes:
+      - ./volumes/matrixone/data:/mo-data
+
   # https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html
   # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-prod-prerequisites
   elasticsearch:

dify/code/middleware.env.example

@@ -1,7 +1,7 @@
 # ------------------------------
 # Environment Variables for db Service
 # ------------------------------
-PGUSER=postgres
+POSTGRES_USER=postgres
 # The password for the default postgres user.
 POSTGRES_PASSWORD=difyai123456
 # The name of the default postgres database.
@@ -87,3 +87,74 @@ EXPOSE_REDIS_PORT=6379
 EXPOSE_SANDBOX_PORT=8194
 EXPOSE_SSRF_PROXY_PORT=3128
 EXPOSE_WEAVIATE_PORT=8080
+
+# ------------------------------
+# Plugin Daemon Configuration
+# ------------------------------
+
+DB_PLUGIN_DATABASE=dify_plugin
+EXPOSE_PLUGIN_DAEMON_PORT=5002
+PLUGIN_DAEMON_PORT=5002
+PLUGIN_DAEMON_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi
+PLUGIN_DAEMON_URL=http://host.docker.internal:5002
+PLUGIN_MAX_PACKAGE_SIZE=52428800
+PLUGIN_PPROF_ENABLED=false
+PLUGIN_WORKING_PATH=/app/storage/cwd
+
+ENDPOINT_URL_TEMPLATE=http://localhost:5002/e/{hook_id}
+
+PLUGIN_DEBUGGING_PORT=5003
+PLUGIN_DEBUGGING_HOST=0.0.0.0
+EXPOSE_PLUGIN_DEBUGGING_HOST=localhost
+EXPOSE_PLUGIN_DEBUGGING_PORT=5003
+
+PLUGIN_DIFY_INNER_API_KEY=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1
+PLUGIN_DIFY_INNER_API_URL=http://host.docker.internal:5001
+
+MARKETPLACE_ENABLED=true
+MARKETPLACE_API_URL=https://marketplace.dify.ai
+
+FORCE_VERIFYING_SIGNATURE=true
+
+PLUGIN_PYTHON_ENV_INIT_TIMEOUT=120
+PLUGIN_MAX_EXECUTION_TIMEOUT=600
+# PIP_MIRROR_URL=https://pypi.tuna.tsinghua.edu.cn/simple
+PIP_MIRROR_URL=
+
+# https://github.com/langgenius/dify-plugin-daemon/blob/main/.env.example
+# Plugin storage type, local aws_s3 tencent_cos azure_blob
+PLUGIN_STORAGE_TYPE=local
+PLUGIN_STORAGE_LOCAL_ROOT=/app/storage
+PLUGIN_WORKING_PATH=/app/storage/cwd
+PLUGIN_INSTALLED_PATH=plugin
+PLUGIN_PACKAGE_CACHE_PATH=plugin_packages
+PLUGIN_MEDIA_CACHE_PATH=assets
+# Plugin oss bucket
+PLUGIN_STORAGE_OSS_BUCKET=
+# Plugin oss s3 credentials
+PLUGIN_S3_USE_AWS_MANAGED_IAM=false
+PLUGIN_S3_USE_AWS=false
+PLUGIN_S3_ENDPOINT=
+PLUGIN_S3_USE_PATH_STYLE=false
+PLUGIN_AWS_ACCESS_KEY=
+PLUGIN_AWS_SECRET_KEY=
+PLUGIN_AWS_REGION=
+# Plugin oss azure blob
+PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME=
+PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING=
+# Plugin oss tencent cos
+PLUGIN_TENCENT_COS_SECRET_KEY=
+PLUGIN_TENCENT_COS_SECRET_ID=
+PLUGIN_TENCENT_COS_REGION=
+# Plugin oss aliyun oss
+PLUGIN_ALIYUN_OSS_REGION=
+PLUGIN_ALIYUN_OSS_ENDPOINT=
+PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID=
+PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET=
+PLUGIN_ALIYUN_OSS_AUTH_VERSION=v4
+PLUGIN_ALIYUN_OSS_PATH=
+# Plugin oss volcengine tos
+PLUGIN_VOLCENGINE_TOS_ENDPOINT=
+PLUGIN_VOLCENGINE_TOS_ACCESS_KEY=
+PLUGIN_VOLCENGINE_TOS_SECRET_KEY=
+PLUGIN_VOLCENGINE_TOS_REGION=

dify/code/nginx/conf.d/default.conf.template

@@ -24,11 +24,25 @@ server {
       include proxy.conf;
     }
 
-    location / {
+    location /explore {
       proxy_pass http://web:3000;
       include proxy.conf;
     }
 
+    location /e/ {
+      proxy_pass http://plugin_daemon:5002;
+      proxy_set_header Dify-Hook-Url $scheme://$host$request_uri;
+      include proxy.conf;
+    }
+
+    location / {
+      proxy_pass http://web:3000;
+      include proxy.conf;
+    }
+    location /mcp {
+      proxy_pass http://api:5001;
+      include proxy.conf;
+    }
     # placeholder for acme challenge location
     ${ACME_CHALLENGE_LOCATION}
 

dify/code/nginx/docker-entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+HTTPS_CONFIG=''
+
 if [ "${NGINX_HTTPS_ENABLED}" = "true" ]; then
     # Check if the certificate and key files for the specified domain exist
     if [ -n "${CERTBOT_DOMAIN}" ] && \
@@ -20,6 +22,7 @@ if [ "${NGINX_HTTPS_ENABLED}" = "true" ]; then
     # Substitute the HTTPS_CONFIG in the default.conf.template with content from https.conf.template
     envsubst '${HTTPS_CONFIG}' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
 fi
+export HTTPS_CONFIG
 
 if [ "${NGINX_ENABLE_CERTBOT_CHALLENGE}" = "true" ]; then
     ACME_CHALLENGE_LOCATION='location /.well-known/acme-challenge/ { root /var/www/html; }'
@@ -33,7 +36,7 @@ env_vars=$(printenv | cut -d= -f1 | sed 's/^/$/g' | paste -sd, -)
 envsubst "$env_vars" < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
 envsubst "$env_vars" < /etc/nginx/proxy.conf.template > /etc/nginx/proxy.conf
 
-envsubst < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
+envsubst "$env_vars" < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
 
 # Start Nginx using the default entrypoint
-exec nginx -g 'daemon off;'
+exec nginx -g 'daemon off;'

dify/code/nginx/https.conf.template

@@ -6,4 +6,4 @@ ssl_certificate_key ${SSL_CERTIFICATE_KEY_PATH};
 ssl_protocols ${NGINX_SSL_PROTOCOLS};
 ssl_prefer_server_ciphers on;
 ssl_session_cache shared:SSL:10m;
-ssl_session_timeout 10m;
+ssl_session_timeout 10m;

dify/code/nginx/nginx.conf.template

@@ -31,4 +31,4 @@ http {
     client_max_body_size ${NGINX_CLIENT_MAX_BODY_SIZE};
 
     include /etc/nginx/conf.d/*.conf;
-}
+}

dify/code/nginx/proxy.conf.template

@@ -3,6 +3,7 @@
 proxy_set_header Host $host;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 proxy_set_header X-Forwarded-Proto $scheme;
+proxy_set_header X-Forwarded-Port $server_port;
 proxy_http_version 1.1;
 proxy_set_header Connection "";
 proxy_buffering off;

dify/code/pgvector/docker-entrypoint.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+PG_MAJOR=16
+
+if [ "${PG_BIGM}" = "true" ]; then
+  # install pg_bigm
+  apt-get update
+  apt-get install -y curl make gcc postgresql-server-dev-${PG_MAJOR}
+
+  curl -LO https://github.com/pgbigm/pg_bigm/archive/refs/tags/v${PG_BIGM_VERSION}.tar.gz
+  tar xf v${PG_BIGM_VERSION}.tar.gz
+  cd pg_bigm-${PG_BIGM_VERSION} || exit 1
+  make USE_PGXS=1 PG_CONFIG=/usr/bin/pg_config
+  make USE_PGXS=1 PG_CONFIG=/usr/bin/pg_config install
+
+  cd - || exit 1
+  rm -rf v${PG_BIGM_VERSION}.tar.gz pg_bigm-${PG_BIGM_VERSION}
+
+  # enable pg_bigm
+  sed -i -e 's/^#\s*shared_preload_libraries.*/shared_preload_libraries = '\''pg_bigm'\''/' /var/lib/postgresql/data/pgdata/postgresql.conf
+fi
+
+# Run the original entrypoint script
+exec /usr/local/bin/docker-entrypoint.sh postgres

dify/code/ssrf_proxy/squid.conf.template

@@ -7,6 +7,7 @@ acl localnet src 192.168.0.0/16		# RFC 1918 local private network (LAN)
 acl localnet src fc00::/7       	# RFC 4193 local private network range
 acl localnet src fe80::/10      	# RFC 4291 link-local (directly plugged) machines
 acl SSL_ports port 443
+# acl SSL_ports port 1025-65535   # Enable the configuration to resolve this issue: https://github.com/langgenius/dify/issues/12792
 acl Safe_ports port 80		# http
 acl Safe_ports port 21		# ftp
 acl Safe_ports port 443		# https
@@ -18,6 +19,8 @@ acl Safe_ports port 488		# gss-http
 acl Safe_ports port 591		# filemaker
 acl Safe_ports port 777		# multiling http
 acl CONNECT method CONNECT
+acl allowed_domains dstdomain .marketplace.dify.ai
+http_access allow allowed_domains
 http_access deny !Safe_ports
 http_access deny CONNECT !SSL_ports
 http_access allow localhost manager
@@ -41,10 +44,13 @@ refresh_pattern .		0	20%	4320
 
 # cache_dir ufs /var/spool/squid 100 16 256
 # upstream proxy, set to your own upstream proxy IP to avoid SSRF attacks
-# cache_peer 172.1.1.1 parent 3128 0 no-query no-digest no-netdb-exchange default 
+# cache_peer 172.1.1.1 parent 3128 0 no-query no-digest no-netdb-exchange default
 
 ################################## Reverse Proxy To Sandbox ################################
 http_port ${REVERSE_PROXY_PORT} accel vhost
 cache_peer ${SANDBOX_HOST} parent ${SANDBOX_PORT} 0 no-query originserver
 acl src_all src all
 http_access allow src_all
+
+# Unless the option's size is increased, an error will occur when uploading more than two files.
+client_request_buffer_max_size 100 MB

dify/code/startupscripts/init.sh

@@ -8,6 +8,6 @@ if [ -f ${DB_INITIALIZED} ]; then
   exit
 else
   echo 'File does not exist. Standards for first time Start up this DB'
-  "$ORACLE_HOME"/bin/sqlplus -s "/ as sysdba" @"/opt/oracle/scripts/startup/init_user.script"; 
+  "$ORACLE_HOME"/bin/sqlplus -s "/ as sysdba" @"/opt/oracle/scripts/startup/init_user.script";
   touch ${DB_INITIALIZED}
 fi

dify/code/startupscripts/init_user.script

@@ -1,10 +1,10 @@
 show pdbs;
-ALTER SYSTEM SET PROCESSES=500 SCOPE=SPFILE; 
+ALTER SYSTEM SET PROCESSES=500 SCOPE=SPFILE;
 alter session set container= freepdb1;
 create user dify identified by dify DEFAULT TABLESPACE users quota unlimited on users;
 grant DB_DEVELOPER_ROLE to dify;
 
 BEGIN
-CTX_DDL.CREATE_PREFERENCE('my_chinese_vgram_lexer','CHINESE_VGRAM_LEXER');
+CTX_DDL.CREATE_PREFERENCE('dify.world_lexer','WORLD_LEXER');
 END;
 /

dify/code/tidb/config/pd.toml

@@ -0,0 +1,4 @@
+# PD Configuration File reference:
+# https://docs.pingcap.com/tidb/stable/pd-configuration-file#pd-configuration-file
+[replication]
+max-replicas = 1

dify/code/tidb/config/tiflash-learner.toml

@@ -0,0 +1,13 @@
+# TiFlash tiflash-learner.toml Configuration File reference:
+# https://docs.pingcap.com/tidb/stable/tiflash-configuration#configure-the-tiflash-learnertoml-file
+
+log-file = "/logs/tiflash_tikv.log"
+
+[server]
+engine-addr = "tiflash:4030"
+addr = "0.0.0.0:20280"
+advertise-addr = "tiflash:20280"
+status-addr = "tiflash:20292"
+
+[storage]
+data-dir = "/data/flash"

dify/code/tidb/config/tiflash.toml

@@ -0,0 +1,19 @@
+# TiFlash tiflash.toml Configuration File reference:
+# https://docs.pingcap.com/tidb/stable/tiflash-configuration#configure-the-tiflashtoml-file
+
+listen_host = "0.0.0.0"
+path = "/data"
+
+[flash]
+tidb_status_addr = "tidb:10080"
+service_addr = "tiflash:4030"
+
+[flash.proxy]
+config = "/tiflash-learner.toml"
+
+[logger]
+errorlog = "/logs/tiflash_error.log"
+log = "/logs/tiflash.log"
+
+[raft]
+pd_addr = "pd0:2379"

dify/code/tidb/docker-compose.yaml

@@ -0,0 +1,62 @@
+services:
+  pd0:
+    image: pingcap/pd:v8.5.1
+    # ports:
+    #  - "2379"
+    volumes:
+      - ./config/pd.toml:/pd.toml:ro
+      - ./volumes/data:/data
+      - ./volumes/logs:/logs
+    command:
+      - --name=pd0
+      - --client-urls=http://0.0.0.0:2379
+      - --peer-urls=http://0.0.0.0:2380
+      - --advertise-client-urls=http://pd0:2379
+      - --advertise-peer-urls=http://pd0:2380
+      - --initial-cluster=pd0=http://pd0:2380
+      - --data-dir=/data/pd
+      - --config=/pd.toml
+      - --log-file=/logs/pd.log
+    restart: on-failure
+  tikv:
+    image: pingcap/tikv:v8.5.1
+    volumes:
+      - ./volumes/data:/data
+      - ./volumes/logs:/logs
+    command:
+      - --addr=0.0.0.0:20160
+      - --advertise-addr=tikv:20160
+      - --status-addr=tikv:20180
+      - --data-dir=/data/tikv
+      - --pd=pd0:2379
+      - --log-file=/logs/tikv.log
+    depends_on:
+      - "pd0"
+    restart: on-failure
+  tidb:
+    image: pingcap/tidb:v8.5.1
+    # ports:
+    #   - "4000:4000"
+    volumes:
+      - ./volumes/logs:/logs
+    command:
+      - --advertise-address=tidb
+      - --store=tikv
+      - --path=pd0:2379
+      - --log-file=/logs/tidb.log
+    depends_on:
+      - "tikv"
+    restart: on-failure
+  tiflash:
+    image: pingcap/tiflash:v8.5.1
+    volumes:
+      - ./config/tiflash.toml:/tiflash.toml:ro
+      - ./config/tiflash-learner.toml:/tiflash-learner.toml:ro
+      - ./volumes/data:/data
+      - ./volumes/logs:/logs
+    command:
+      - --config=/tiflash.toml
+    depends_on:
+      - "tikv"
+      - "tidb"
+    restart: on-failure

dify/code/volumes/myscale/config/users.d/custom_users_config.xml

@@ -14,4 +14,4 @@
             <access_management>1</access_management>
         </default>
     </users>
-</clickhouse>
+</clickhouse>

dify/code/volumes/oceanbase/init.d/vec_memory.sql

@@ -1 +1 @@
-ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30;
+ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30;

dify/update.js

@@ -4,3 +4,15 @@ await utils.cloneOrPullRepo({ repo: "https://github.com/langgenius/dify.git" });
 await utils.copyDir("./repo/docker", "./code");
 await utils.removeContainerNames("./code/docker-compose.yaml");
 await utils.removePorts("./code/docker-compose.yaml");
+
+await utils.searchReplace(
+  "./code/.env.example",
+  "APP_WEB_URL=",
+  "APP_WEB_URL=https://$(PRIMARY_DOMAIN)"
+);
+
+await utils.searchReplace(
+  "./code/.env.example",
+  "SECRET_KEY=sk-9f73s3ljTXVcMT3Blb3ljTqtsKiGHXVcMT3BlbkFJLK7U",
+  "SECRET_KEY="
+);

dify/update.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [ ! -d "./repo" ]; then
-    git clone --depth 1 --branch main --single-branch https://github.com/langgenius/dify.git repo
-else
-    cd repo
-    git pull
-    cd ..
-fi
-
-cp -r ./repo/docker/. ./code
-
-

plane/README.md

@@ -1,4 +1,42 @@
-# Plane
+# Plane - Project Management Script
 
-- copied from https://github.com/makeplane/plane
-- removed `ports`
+This directory contains the Plane project management tool deployment for Easypanel.
+
+## Update Process
+
+To update Plane to the latest version, follow these steps in order:
+
+### Step 1: Run the Setup Script for Upgrade
+
+First, run the `setup.sh` script and choose the upgrade option:
+
+```
+./setup.sh
+```
+
+When prompted, select option **5** for "Upgrade". This will:
+
+*   Check for the latest available release
+*   Download the latest stable version
+
+### Step 2: Run the Update Script
+
+After the setup script completes successfully, run the `update.js` script:
+
+```
+node update.js
+```
+
+This script will:
+
+*   Removes the existing code directory and changes the name for the newly fetched directory to code. 
+*   Rename `plane.env` to `.env.example`
+*   Rename `docker-compose.yaml` to `docker-compose.yml`
+*   Remove container names and ports from docker-compose.yml
+*   Update environment variables to use Easypanel's `PRIMARY_DOMAIN` variable
+
+## Important Notes
+
+*   **Always run setup.sh first** - This ensures you get the latest official Plane release
+*   **Then run update.js** - This applies Easypanel-specific customizations
+*   The update process will preserve your existing data and configuration

plane/code/.env.example

@@ -1,17 +1,21 @@
-APP_DOMAIN=localhost
-APP_RELEASE=stable
+APP_DOMAIN=$(PRIMARY_DOMAIN)
+APP_RELEASE=v0.28.0
+SSL=false
 
 WEB_REPLICAS=1
 SPACE_REPLICAS=1
 ADMIN_REPLICAS=1
 API_REPLICAS=1
+WORKER_REPLICAS=1
+BEAT_WORKER_REPLICAS=1
+LIVE_REPLICAS=1
 
-NGINX_PORT=80
-WEB_URL=http://${APP_DOMAIN}
+LISTEN_HTTP_PORT=80
+LISTEN_HTTPS_PORT=443
+
+WEB_URL=https://$(PRIMARY_DOMAIN)
 DEBUG=0
-SENTRY_DSN=
-SENTRY_ENVIRONMENT=production
-CORS_ALLOWED_ORIGINS=http://${APP_DOMAIN}
+CORS_ALLOWED_ORIGINS=https://$(PRIMARY_DOMAIN)
 API_BASE_URL=http://api:8000
 
 #DB SETTINGS
@@ -37,6 +41,19 @@ RABBITMQ_PASSWORD=plane
 RABBITMQ_VHOST=plane
 AMQP_URL=
 
+# If SSL Cert to be generated, set CERT_EMAIl="email <EMAIL_ADDRESS>"
+CERT_ACME_CA=https://acme-v02.api.letsencrypt.org/directory
+TRUSTED_PROXIES=0.0.0.0/0
+SITE_ADDRESS=:80
+CERT_EMAIL=
+
+
+
+# For DNS Challenge based certificate generation, set the CERT_ACME_DNS, CERT_EMAIL
+# CERT_ACME_DNS="acme_dns <CERT_DNS_PROVIDER> <CERT_DNS_PROVIDER_API_KEY>"
+CERT_ACME_DNS=
+
+
 # Secret Key
 SECRET_KEY=60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5
 
@@ -55,3 +72,11 @@ GUNICORN_WORKERS=1
 # UNCOMMENT `DOCKER_PLATFORM` IF YOU ARE ON `ARM64` AND DOCKER IMAGE IS NOT AVAILABLE FOR RESPECTIVE `APP_RELEASE`
 # DOCKER_PLATFORM=linux/amd64
 
+# Force HTTPS for handling SSL Termination
+MINIO_ENDPOINT_SSL=0
+
+# API key rate limit
+API_KEY_RATE_LIMIT=60/minute
+DOCKERHUB_USER=artifacts.plane.so/makeplane
+PULL_POLICY=if_not_present
+CUSTOM_BUILD=false

plane/code/README.md

@@ -1,483 +0,0 @@
-# Self Hosting
-
-In this guide, we will walk you through the process of setting up a self-hosted environment. Self-hosting allows you to have full control over your applications and data. It's a great way to ensure privacy, control, and customization.
-
-We will cover two main options for setting up your self-hosted environment: using a cloud server or using your desktop. For the cloud server, we will use an AWS EC2 instance. For the desktop, we will use Docker to create a local environment.
-
-Let's get started!
-
-## Setting up Docker Environment
-
-<details>
-  <summary>Option 1 - Using Cloud Server</summary>
-  <p>Best way to start is to create EC2 machine on AWS. It must have minimum of 2vCPU and 4GB RAM.</p>
-  <p>Run the below command to install docker engine.</p>
-
-`curl -fsSL https://get.docker.com | sh -`
-
-</details>
-
----
-
-<details>
-  <summary>Option 2 - Using Desktop</summary>
-
-#### For Mac
-
-  <ol>
-    <li> Download Docker Desktop for Mac from the <a href="https://hub.docker.com/editions/community/docker-ce-desktop-mac/" target="_blank">Docker Hub</a>. </li>
-    <li> Double-click the downloaded `.dmg` file and drag the Docker app icon to the Applications folder. </li>
-    <li>Open Docker Desktop from the Applications folder. You might be asked to provide your system password to install additional software.</li>
-  </ol>
-
-#### For Windows:
-
-  <ol>
-    <li>Download Docker Desktop for Windows from the <a href="https://hub.docker.com/editions/community/docker-ce-desktop-windows/" target="_blank">Docker Hub</a>.</li>
-    <li>Run the installer and follow the instructions. You might be asked to enable Hyper-V and "Containers" Windows features.</li>
-    <li>Open Docker Desktop. You might be asked to log out and log back in, or restart your machine, for changes to take effect.</li>
-  </ol>
-
-After installation, you can verify the installation by opening a terminal (Command Prompt on Windows, Terminal app on Mac) and running the command `docker --version`. This should display the installed version of Docker.
-
-</details>
-
----
-
-## Installing Plane
-
-Installing plane is a very easy and minimal step process.
-
-### Prerequisite
-
-- Docker installed and running
-- OS with bash scripting enabled (Ubuntu, Linux AMI, macos). Windows systems need to have [gitbash](https://git-scm.com/download/win)
-- User context used must have access to docker services. In most cases, use sudo su to switch as root user
-- Use the terminal (or gitbash) window to run all the future steps
-
-### Downloading Latest Stable Release
-
-```
-mkdir plane-selfhost
-
-cd plane-selfhost
-
-curl -fsSL -o setup.sh https://github.com/makeplane/plane/releases/latest/download/setup.sh
-
-chmod +x setup.sh
-```
-
----
-
-### Proceed with setup
-
-Above steps will set you ready to install and start plane services.
-
-Lets get started by running the `./setup.sh` command.
-
-This will prompt you with the below options.
-
-```bash
-Select a Action you want to perform:
-   1) Install (x86_64)
-   2) Start
-   3) Stop
-   4) Restart
-   5) Upgrade
-   6) View Logs
-   7) Backup Data
-   8) Exit
-Action [2]: 1
-```
-
-For the 1st time setup, type "1" as action input.
-
-This will create a create a folder `plane-app` or `plane-app-preview` (in case of preview deployment) and will download 2 files inside that
-
-- `docker-compose.yaml`
-- `plane.env`
-
-Again the `options [1-8]` will be popped up and this time hit `8` to exit.
-
----
-
-### Continue with setup - Environment Settings
-
-Before proceeding, we suggest used to review `.env` file and set the values.
-Below are the most import keys you must refer to. _<span style="color: #fcba03">You can use any text editor to edit this file</span>_.
-
-> `NGINX_PORT` - This is default set to `80`. Make sure the port you choose to use is not preoccupied. (e.g `NGINX_PORT=8080`)
-
-> `WEB_URL` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`)
-
-> `CORS_ALLOWED_ORIGINS` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`)
-
-There are many other settings you can play with, but we suggest you configure `EMAIL SETTINGS` as it will enable you to invite your teammates onto the platform.
-
----
-
-### Continue with setup - Start Server
-
-Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `2` to start the sevices
-
-```bash
-Select a Action you want to perform:
-   1) Install (x86_64)
-   2) Start
-   3) Stop
-   4) Restart
-   5) Upgrade
-   6) View Logs
-   7) Backup Data
-   8) Exit
-
-Action [2]: 2
-```
-
-Expect something like this.  
-![Downloading docker images](images/download.png)
-
-Be patient as it might take sometime based on download speed and system configuration. If all goes well, you must see something like this
-
-![Downloading completed](images/started.png)
-
-This is the confirmation that all images were downloaded and the services are up & running.
-
-You have successfully self hosted `Plane` instance. Access the application by going to IP or domain you have configured it (e.g `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`)
-
----
-
-### Stopping the Server
-
-In case you want to make changes to `.env` variables, we suggest you to stop the services before doing that.
-
-Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `3` to stop the sevices
-
-```bash
-Select a Action you want to perform:
-   1) Install (x86_64)
-   2) Start
-   3) Stop
-   4) Restart
-   5) Upgrade
-   6) View Logs
-   7) Backup Data
-   8) Exit
-
-Action [2]: 3
-```
-
-If all goes well, you must see something like this
-
-![Stop Services](images/stopped.png)
-
----
-
-### Restarting the Server
-
-In case you want to make changes to `.env` variables, without stopping the server or you noticed some abnormalies in services, you can restart the services with RESTART option.
-
-Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `4` to restart the sevices
-
-```bash
-Select a Action you want to perform:
-   1) Install (x86_64)
-   2) Start
-   3) Stop
-   4) Restart
-   5) Upgrade
-   6) View Logs
-   7) Backup Data
-   8) Exit
-
-Action [2]: 4
-```
-
-If all goes well, you must see something like this
-
-![Restart Services](images/restart.png)
-
----
-
-### Upgrading Plane Version
-
-It is always advised to keep Plane up to date with the latest release.
-
-Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `5` to upgrade the release.
-
-```bash
-Select a Action you want to perform:
-   1) Install (x86_64)
-   2) Start
-   3) Stop
-   4) Restart
-   5) Upgrade
-   6) View Logs
-   7) Backup Data
-   8) Exit
-
-Action [2]: 5
-```
-
-By choosing this, it will stop the services and then will download the latest `docker-compose.yaml` and `plane.env`.
-
-You must expect the below message
-
-![Alt text](images/upgrade.png)
-
-Once done, choose `8` to exit from prompt.
-
-> It is very important for you to validate the `plane.env` for the new changes.
-
-Once done with making changes in `plane.env` file, jump on to `Start Server`
-
----
-
-### View Logs
-
-There would a time when you might want to check what is happening inside the API, Worker or any other container.  
-
-Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `6` to view logs.
-
-```bash
-Select a Action you want to perform:
-   1) Install (x86_64)
-   2) Start
-   3) Stop
-   4) Restart
-   5) Upgrade
-   6) View Logs
-   7) Backup Data
-   8) Exit
-
-Action [2]: 6
-```
-
-
-This will further open sub-menu with list of services
-```bash
-Select a Service you want to view the logs for:
-   1) Web
-   2) Space
-   3) API
-   4) Worker
-   5) Beat-Worker
-   6) Migrator
-   7) Proxy
-   8) Redis
-   9) Postgres
-   10) Minio
-   0) Back to Main Menu
-
-Service: 
-```
-
-Select any of the service to view the logs e.g. `3`. Expect something similar to this
-```bash
-api-1  | Waiting for database...
-api-1  | Database available!
-api-1  | Waiting for database migrations to complete...
-api-1  | Waiting for database migrations to complete...
-api-1  | Waiting for database migrations to complete...
-api-1  | Waiting for database migrations to complete...
-api-1  | Waiting for database migrations to complete...
-api-1  | Waiting for database migrations to complete...
-api-1  | Waiting for database migrations to complete...
-api-1  | No migrations Pending. Starting processes ...
-api-1  | Instance registered
-api-1  | ENABLE_SIGNUP loaded with value from environment variable.
-api-1  | ENABLE_EMAIL_PASSWORD loaded with value from environment variable.
-api-1  | ENABLE_MAGIC_LINK_LOGIN loaded with value from environment variable.
-api-1  | GOOGLE_CLIENT_ID loaded with value from environment variable.
-api-1  | GITHUB_CLIENT_ID loaded with value from environment variable.
-api-1  | GITHUB_CLIENT_SECRET loaded with value from environment variable.
-api-1  | EMAIL_HOST loaded with value from environment variable.
-api-1  | EMAIL_HOST_USER loaded with value from environment variable.
-api-1  | EMAIL_HOST_PASSWORD loaded with value from environment variable.
-api-1  | EMAIL_PORT loaded with value from environment variable.
-api-1  | EMAIL_FROM loaded with value from environment variable.
-api-1  | EMAIL_USE_TLS loaded with value from environment variable.
-api-1  | EMAIL_USE_SSL loaded with value from environment variable.
-api-1  | OPENAI_API_KEY loaded with value from environment variable.
-api-1  | GPT_ENGINE loaded with value from environment variable.
-api-1  | UNSPLASH_ACCESS_KEY loaded with value from environment variable.
-api-1  | Checking bucket...
-api-1  | Bucket 'uploads' does not exist. Creating bucket...
-api-1  | Bucket 'uploads' created successfully.
-api-1  | Public read access policy set for bucket 'uploads'.
-api-1  | Cache Cleared
-api-1  | [2024-05-02 03:56:01 +0000] [1] [INFO] Starting gunicorn 21.2.0
-api-1  | [2024-05-02 03:56:01 +0000] [1] [INFO] Listening at: http://0.0.0.0:8000 (1)
-api-1  | [2024-05-02 03:56:01 +0000] [1] [INFO] Using worker: uvicorn.workers.UvicornWorker
-api-1  | [2024-05-02 03:56:01 +0000] [25] [INFO] Booting worker with pid: 25
-api-1  | [2024-05-02 03:56:03 +0000] [25] [INFO] Started server process [25]
-api-1  | [2024-05-02 03:56:03 +0000] [25] [INFO] Waiting for application startup.
-api-1  | [2024-05-02 03:56:03 +0000] [25] [INFO] ASGI 'lifespan' protocol appears unsupported.
-api-1  | [2024-05-02 03:56:03 +0000] [25] [INFO] Application startup complete.
-
-```
-
-To exit this, use `CTRL+C` and then you will land on to the main-menu with the list of actions. 
-
-Similarly, you can view the logs of other services. 
-
----
-
-### Backup Data
-
-There would a time when you might want to backup your data from docker volumes to external storage like S3 or drives.
-
-Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `7` to Backup the data.
-
-```bash
-Select a Action you want to perform:
-   1) Install (x86_64)
-   2) Start
-   3) Stop
-   4) Restart
-   5) Upgrade
-   6) View Logs
-   7) Backup Data
-   8) Exit
-
-Action [2]: 7
-```
-
-In response, you can find the backup folder
-
-```bash
-Backing Up plane-app_pgdata
-Backing Up plane-app_redisdata
-Backing Up plane-app_uploads
-
-Backup completed successfully. Backup files are stored in /....../plane-app/backup/20240502-1120
-```
-
----
-
-### Restore Data
-
-When you want to restore the previously backed-up data, follow the instructions below.
-
-1. Make sure that Plane-CE is installed, started, and then stopped. This ensures that the Docker volumes are created.
-
-1. Download the restore script using the command below. We suggest downloading it in the same folder as `setup.sh`.
-
-   ```bash
-   curl -fsSL -o restore.sh https://raw.githubusercontent.com/makeplane/plane/master/deploy/selfhost/restore.sh
-   chmod +x restore.sh
-   ```
-
-1. Execute the command below to restore your data.
-
-   ```bash
-   ./restore.sh <path to backup folder containing *.tar.gz files>
-   ```
-
-   As an example, for a backup folder `/opt/plane-selfhost/plane-app/backup/20240722-0914`, expect the response below:
-
-   ```bash
-   --------------------------------------------
-    ____  _                          ///////// 
-   |  _ \| | __ _ _ __   ___         ///////// 
-   | |_) | |/ _` | '_ \ / _ \   /////    ///// 
-   |  __/| | (_| | | | |  __/   /////    ///// 
-   |_|   |_|\__,_|_| |_|\___|        ////      
-                                    ////      
-   --------------------------------------------
-   Project management tool from the future
-   --------------------------------------------
-   Found /opt/plane-selfhost/plane-app/backup/20240722-0914/pgdata.tar.gz
-   .....Restoring plane-app_pgdata
-   .....Successfully restored volume plane-app_pgdata from pgdata.tar.gz
-
-   Found /opt/plane-selfhost/plane-app/backup/20240722-0914/redisdata.tar.gz
-   .....Restoring plane-app_redisdata
-   .....Successfully restored volume plane-app_redisdata from redisdata.tar.gz
-
-   Found /opt/plane-selfhost/plane-app/backup/20240722-0914/uploads.tar.gz
-   .....Restoring plane-app_uploads
-   .....Successfully restored volume plane-app_uploads from uploads.tar.gz
-
-
-   Restore completed successfully.
-   ```
-
-1. Start the Plane instance using `./setup.sh start`.
-
----
-
-<details>
-   <summary><h2>Upgrading from v0.13.2 to v0.14.x</h2></summary>
-
-This is one time activity for users who are upgrading from v0.13.2 to v0.14.0
-
-As there has been significant changes to Self Hosting process, this step mainly covers the data migration from current (v0.13.2) docker volumes from newly created volumes
-
-> Before we begin with migration, make sure your v0.14.0 was started and then stopped. This is required to know the newly created docker volume names.
-
-Begin with downloading the migration script using below command
-
-```
-
-curl -fsSL -o migrate.sh https://raw.githubusercontent.com/makeplane/plane/master/deploy/selfhost/migration-0.13-0.14.sh
-
-chmod +x migrate.sh
-
-```
-
-Now run the `./migrate.sh` command and expect the instructions as below
-
-```
-******************************************************************
-
-This script is solely for the migration purpose only.
-This is a 1 time migration of volume data from v0.13.2 => v0.14.x
-
-Assumption:
-1. Postgres data volume name ends with _pgdata
-2. Minio data volume name ends with _uploads
-3. Redis data volume name ends with _redisdata
-
-Any changes to this script can break the migration.
-
-Before you proceed, make sure you run the below command
-to know the docker volumes
-
-docker volume ls -q | grep -i "_pgdata"
-docker volume ls -q | grep -i "_uploads"
-docker volume ls -q | grep -i "_redisdata"
-
-*******************************************************
-
-Given below list of REDIS volumes, identify the prefix of source and destination volumes leaving "_redisdata"
----------------------
-plane-app_redisdata
-v0132_redisdata
-
-Provide the Source Volume Prefix :
-```
-
-**Open another terminal window**, and run the mentioned 3 command. This may be different for users who have changed the volume names in their previous setup (v0.13.2)
-
-For every command you must see 2 records something like shown in above example of `redisdata`
-
-To move forward, you would need PREFIX of old setup and new setup. As per above example, `v0132` is the prefix of v0.13.2 and `plane-app` is the prefix of v0.14.0 setup
-
-**Back to original terminal window**, _Provide the Source Volume Prefix_ and hit ENTER.
-
-Now you will be prompted to _Provide Destination Volume Prefix_. Provide the value and hit ENTER
-
-```
-Provide the Source Volume Prefix : v0132
-Provide the Destination Volume Prefix : plane-app
-```
-
-In case the suffixes are wrong or the mentioned volumes are not found, you will receive the error shown below. The image below displays an error for source volumes.
-
-![Migrate Error](images/migrate-error.png)
-
-In case of successful migration, it will be a silent exit without error.
-
-Now its time to restart v0.14.0 setup.
-</details>

plane/code/build.yml

@@ -1,30 +0,0 @@
-services:
-  web:
-    image: ${DOCKERHUB_USER:-local}/plane-frontend:${APP_RELEASE:-latest}
-    build:
-      context: .
-      dockerfile: ./web/Dockerfile.web
-
-  space:
-    image: ${DOCKERHUB_USER:-local}/plane-space:${APP_RELEASE:-latest}
-    build:
-      context: ./
-      dockerfile: ./space/Dockerfile.space
-
-  admin:
-    image: ${DOCKERHUB_USER:-local}/plane-admin:${APP_RELEASE:-latest}
-    build:
-      context: ./
-      dockerfile: ./admin/Dockerfile.admin
-
-  api:
-    image: ${DOCKERHUB_USER:-local}/plane-backend:${APP_RELEASE:-latest}
-    build:
-      context: ./apiserver
-      dockerfile: ./Dockerfile.api
-
-  proxy:
-    image: ${DOCKERHUB_USER:-local}/plane-proxy:${APP_RELEASE:-latest}
-    build:
-      context: ./nginx
-      dockerfile: ./Dockerfile

plane/code/docker-compose.yml

@@ -24,9 +24,16 @@ x-aws-s3-env: &aws-s3-env
   AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
 
 x-proxy-env: &proxy-env
-  NGINX_PORT: ${NGINX_PORT:-80}
-  BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
+  SSL: ${SSL:-false}
+  APP_DOMAIN: ${APP_DOMAIN:-localhost}
   FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
+  CERT_EMAIL: ${CERT_EMAIL}
+  CERT_ACME_CA: ${CERT_ACME_CA}
+  CERT_ACME_DNS: ${CERT_ACME_DNS}
+  LISTEN_HTTP_PORT: ${LISTEN_HTTP_PORT:-80}
+  LISTEN_HTTPS_PORT: ${LISTEN_HTTPS_PORT:-443}
+  BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
+  SITE_ADDRESS: ${SITE_ADDRESS:-:80}
 
 x-mq-env:
   # RabbitMQ Settings
@@ -44,78 +51,66 @@ x-live-env: &live-env
 x-app-env: &app-env
   WEB_URL: ${WEB_URL:-http://localhost}
   DEBUG: ${DEBUG:-0}
-  SENTRY_DSN: ${SENTRY_DSN}
-  SENTRY_ENVIRONMENT: ${SENTRY_ENVIRONMENT:-production}
   CORS_ALLOWED_ORIGINS: ${CORS_ALLOWED_ORIGINS}
   GUNICORN_WORKERS: 1
   USE_MINIO: ${USE_MINIO:-1}
   DATABASE_URL: ${DATABASE_URL:-postgresql://plane:plane@plane-db/plane}
   SECRET_KEY: ${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
-  ADMIN_BASE_URL: ${ADMIN_BASE_URL}
-  SPACE_BASE_URL: ${SPACE_BASE_URL}
-  APP_BASE_URL: ${APP_BASE_URL}
   AMQP_URL: ${AMQP_URL:-amqp://plane:plane@plane-mq:5672/plane}
+  API_KEY_RATE_LIMIT: ${API_KEY_RATE_LIMIT:-60/minute}
+  MINIO_ENDPOINT_SSL: ${MINIO_ENDPOINT_SSL:-0}
 
 services:
   web:
-    image: ${DOCKERHUB_USER:-makeplane}/plane-frontend:${APP_RELEASE:-stable}
-    platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
-    restart: unless-stopped
-    command: node web/server.js web
+    image: artifacts.plane.so/makeplane/plane-frontend:${APP_RELEASE:-v0.28.0}
     deploy:
       replicas: ${WEB_REPLICAS:-1}
+      restart_policy:
+        condition: on-failure
     depends_on:
       - api
       - worker
 
   space:
-    image: ${DOCKERHUB_USER:-makeplane}/plane-space:${APP_RELEASE:-stable}
-    platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
-    restart: unless-stopped
-    command: node space/server.js space
+    image: artifacts.plane.so/makeplane/plane-space:${APP_RELEASE:-v0.28.0}
     deploy:
       replicas: ${SPACE_REPLICAS:-1}
+      restart_policy:
+        condition: on-failure
     depends_on:
       - api
       - worker
       - web
 
   admin:
-    image: ${DOCKERHUB_USER:-makeplane}/plane-admin:${APP_RELEASE:-stable}
-    platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
-    restart: unless-stopped
-    command: node admin/server.js admin
+    image: artifacts.plane.so/makeplane/plane-admin:${APP_RELEASE:-v0.28.0}
     deploy:
       replicas: ${ADMIN_REPLICAS:-1}
+      restart_policy:
+        condition: on-failure
     depends_on:
       - api
       - web
 
   live:
-    image: ${DOCKERHUB_USER:-makeplane}/plane-live:${APP_RELEASE:-stable}
-    platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
-    restart: unless-stopped
-    command: node live/dist/server.js live
+    image: artifacts.plane.so/makeplane/plane-live:${APP_RELEASE:-v0.28.0}
     environment:
       <<: [ *live-env ]
     deploy:
       replicas: ${LIVE_REPLICAS:-1}
+      restart_policy:
+        condition: on-failure
     depends_on:
       - api
       - web
 
   api:
-    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
-    platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
-    restart: unless-stopped
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0}
     command: ./bin/docker-entrypoint-api.sh
     deploy:
       replicas: ${API_REPLICAS:-1}
+      restart_policy:
+        condition: on-failure
     volumes:
       - logs_api:/code/plane/logs
     environment:
@@ -126,11 +121,12 @@ services:
       - plane-mq
 
   worker:
-    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
-    platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
-    restart: unless-stopped
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0}
     command: ./bin/docker-entrypoint-worker.sh
+    deploy:
+      replicas: ${WORKER_REPLICAS:-1}
+      restart_policy:
+        condition: on-failure
     volumes:
       - logs_worker:/code/plane/logs
     environment:
@@ -142,11 +138,12 @@ services:
       - plane-mq
 
   beat-worker:
-    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
-    platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
-    restart: unless-stopped
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0}
     command: ./bin/docker-entrypoint-beat.sh
+    deploy:
+      replicas: ${BEAT_WORKER_REPLICAS:-1}
+      restart_policy:
+        condition: on-failure
     volumes:
       - logs_beat-worker:/code/plane/logs
     environment:
@@ -158,11 +155,12 @@ services:
       - plane-mq
 
   migrator:
-    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
-    platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
-    restart: "no"
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0}
     command: ./bin/docker-entrypoint-migrator.sh
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
     volumes:
       - logs_migrator:/code/plane/logs
     environment:
@@ -171,11 +169,14 @@ services:
       - plane-db
       - plane-redis
 
+  # Comment this if you already have a database running
   plane-db:
     image: postgres:15.7-alpine
-    pull_policy: if_not_present
-    restart: unless-stopped
     command: postgres -c 'max_connections=1000'
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
     environment:
       <<: *db-env
     volumes:
@@ -183,24 +184,32 @@ services:
 
   plane-redis:
     image: valkey/valkey:7.2.5-alpine
-    pull_policy: if_not_present
-    restart: unless-stopped
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
     volumes:
       - redisdata:/data
 
   plane-mq:
     image: rabbitmq:3.13.6-management-alpine
-    restart: always
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
     environment:
       <<: *mq-env
     volumes:
       - rabbitmq_data:/var/lib/rabbitmq
 
+  # Comment this if you using any external s3 compatible storage
   plane-minio:
     image: minio/minio:latest
-    pull_policy: if_not_present
-    restart: unless-stopped
     command: server /export --console-address ":9090"
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
     environment:
       <<: *minio-env
     volumes:
@@ -208,24 +217,40 @@ services:
 
   # Comment this if you already have a reverse proxy running
   proxy:
-    image: ${DOCKERHUB_USER:-makeplane}/plane-proxy:${APP_RELEASE:-stable}
-    platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
-    restart: unless-stopped
+    image: artifacts.plane.so/makeplane/plane-proxy:${APP_RELEASE:-v0.28.0}
+    command:
+      [
+        "caddy",
+        "run",
+        "--config",
+        "/etc/caddy/Caddyfile",
+        "--adapter",
+        "caddyfile"
+      ]
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
     environment:
       <<: *proxy-env
+    volumes:
+      - proxy_config:/config
+      - proxy_data:/data
     depends_on:
       - web
       - api
       - space
+      - admin
+      - live
 
 volumes:
   pgdata:
   redisdata:
-
   uploads:
   logs_api:
   logs_worker:
   logs_beat-worker:
   logs_migrator:
   rabbitmq_data:
+  proxy_config:
+  proxy_data:

plane/code/migration-0.13-0.14.sh

@@ -1,118 +0,0 @@
-#!/bin/bash
-
-echo '
-******************************************************************
-
-This script is solely for the migration purpose only. 
-This is a 1 time migration of volume data from v0.13.2 => v0.14.x
-
-Assumption: 
-1. Postgres data volume name ends with _pgdata
-2. Minio data volume name ends with _uploads
-3. Redis data volume name ends with _redisdata
-
-Any changes to this script can break the migration. 
-
-Before you proceed, make sure you run the below command
-to know the docker volumes
-
-docker volume ls -q | grep -i "_pgdata"
-docker volume ls -q | grep -i "_uploads"
-docker volume ls -q | grep -i "_redisdata"
-
-*******************************************************
-'
-
-DOWNLOAD_FOL=./download
-rm -rf ${DOWNLOAD_FOL}
-mkdir -p ${DOWNLOAD_FOL}
-
-function volumeExists {
-  if [ "$(docker volume ls -f name=$1 | awk '{print $NF}' | grep -E '^'$1'$')" ]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function readPrefixes(){
-    echo ''
-    echo 'Given below list of REDIS volumes, identify the prefix of source and destination volumes leaving "_redisdata" '
-    echo '---------------------'
-    docker volume ls -q | grep -i "_redisdata"
-    echo ''
-    
-    read -p "Provide the Source Volume Prefix : " SRC_VOL_PREFIX
-    until [ "$SRC_VOL_PREFIX"  ]; do
-        read -p "Provide the Source Volume Prefix : " SRC_VOL_PREFIX
-    done
-
-    read -p "Provide the Destination Volume Prefix : " DEST_VOL_PREFIX
-    until [ "$DEST_VOL_PREFIX"  ]; do
-        read -p "Provide the Source Volume Prefix : " DEST_VOL_PREFIX
-    done
-
-    echo ''
-    echo 'Prefix Provided '
-    echo "  Source : ${SRC_VOL_PREFIX}"
-    echo "  Destination : ${DEST_VOL_PREFIX}"
-    echo '---------------------------------------'
-}
-
-function migrate(){
-
-    SRC_VOLUME=${SRC_VOL_PREFIX}_${VOL_NAME_SUFFIX}
-    DEST_VOLUME=${DEST_VOL_PREFIX}_${VOL_NAME_SUFFIX}
-
-    if volumeExists $SRC_VOLUME; then
-        if volumeExists $DEST_VOLUME; then
-            GOOD_TO_GO=1
-        else 
-            echo "Destination Volume '$DEST_VOLUME' does not exist"
-            echo ''
-        fi
-    else
-        echo "Source Volume '$SRC_VOLUME' does not exist"
-        echo ''
-    fi
-
-    if [ $GOOD_TO_GO = 1 ]; then
-
-        echo "MIGRATING ${VOL_NAME_SUFFIX} FROM ${SRC_VOLUME} => ${DEST_VOLUME}"
-    
-        TEMP_CONTAINER=$(docker run -d -v $SRC_VOLUME:$CONTAINER_VOL_FOLDER busybox true)
-        docker cp -q $TEMP_CONTAINER:$CONTAINER_VOL_FOLDER ${DOWNLOAD_FOL}/${VOL_NAME_SUFFIX}
-        docker rm $TEMP_CONTAINER &> /dev/null
-        
-        TEMP_CONTAINER=$(docker run -d -v $DEST_VOLUME:$CONTAINER_VOL_FOLDER busybox true)
-        if [ "$VOL_NAME_SUFFIX" = "pgdata" ]; then
-            docker cp -q ${DOWNLOAD_FOL}/${VOL_NAME_SUFFIX} $TEMP_CONTAINER:$CONTAINER_VOL_FOLDER/_temp
-            docker run --rm -v $DEST_VOLUME:$CONTAINER_VOL_FOLDER \
-                    -e DATA_FOLDER="${CONTAINER_VOL_FOLDER}" \
-                    busybox /bin/sh -c 'cp -Rf $DATA_FOLDER/_temp/* $DATA_FOLDER '
-        else
-            docker cp -q ${DOWNLOAD_FOL}/${VOL_NAME_SUFFIX} $TEMP_CONTAINER:$CONTAINER_VOL_FOLDER   
-        fi
-        docker rm $TEMP_CONTAINER &> /dev/null
-
-        echo ''
-    fi
-}
-
-readPrefixes
-
-# MIGRATE DB
-CONTAINER_VOL_FOLDER=/var/lib/postgresql/data
-VOL_NAME_SUFFIX=pgdata
-migrate
-
-# MIGRATE REDIS
-CONTAINER_VOL_FOLDER=/data
-VOL_NAME_SUFFIX=redisdata
-migrate
-
-# MIGRATE MINIO
-CONTAINER_VOL_FOLDER=/export
-VOL_NAME_SUFFIX=uploads
-migrate
-

plane/code/restore.sh

@@ -1,121 +0,0 @@
-#!/bin/bash
-
-function print_header() {
-clear
-
-cat <<"EOF"
---------------------------------------------
- ____  _                          ///////// 
-|  _ \| | __ _ _ __   ___         ///////// 
-| |_) | |/ _` | '_ \ / _ \   /////    ///// 
-|  __/| | (_| | | | |  __/   /////    ///// 
-|_|   |_|\__,_|_| |_|\___|        ////      
-                                  ////      
---------------------------------------------
-Project management tool from the future
---------------------------------------------
-EOF
-}
-
-function restoreSingleVolume() {
-    selectedVolume=$1
-    backupFolder=$2
-    restoreFile=$3
-
-    docker volume rm "$selectedVolume" > /dev/null 2>&1
-    
-    if [ $? -ne 0 ]; then
-        echo "Error: Failed to remove volume $selectedVolume"
-        echo ""
-        return 1
-    fi
-
-    docker volume create "$selectedVolume" > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        echo "Error: Failed to create volume $selectedVolume"
-        echo ""
-        return 1
-    fi
-
-    docker run --rm \
-        -e TAR_NAME="$restoreFile" \
-        -v "$selectedVolume":"/vol" \
-        -v "$backupFolder":/backup \
-        busybox sh -c 'mkdir -p /restore && tar -xzf "/backup/${TAR_NAME}.tar.gz" -C /restore && mv /restore/${TAR_NAME}/* /vol'
-    
-    if [ $? -ne 0 ]; then
-        echo "Error: Failed to restore volume ${selectedVolume} from ${restoreFile}.tar.gz"
-        echo ""
-        return 1
-    fi
-    echo ".....Successfully restored volume $selectedVolume from ${restoreFile}.tar.gz"
-    echo ""
-}
-
-function restoreData() {
-    print_header
-    local BACKUP_FOLDER=${1:-$PWD}
-
-    local dockerServiceStatus
-    dockerServiceStatus=$($COMPOSE_CMD ls --filter name=plane-app --format=json | jq -r .[0].Status)
-    local dockerServicePrefix
-    dockerServicePrefix="running"
-
-    if [[ $dockerServiceStatus == $dockerServicePrefix* ]]; then
-        echo "Plane App is running. Please STOP the Plane App before restoring data."
-        exit 1
-    fi
-
-    local volumes
-    volumes=$(docker volume ls -f "name=plane-app" --format "{{.Name}}" | grep -E "_pgdata|_redisdata|_uploads")
-    # Check if there are any matching volumes
-    if [ -z "$volumes" ]; then
-        echo ".....No volumes found starting with 'plane-app'"
-        exit 1
-    fi
-    
-
-    for BACKUP_FILE in $BACKUP_FOLDER/*.tar.gz; do
-        if [ -e "$BACKUP_FILE" ]; then
-            
-            local restoreFileName
-            restoreFileName=$(basename "$BACKUP_FILE")
-            restoreFileName="${restoreFileName%.tar.gz}"
-
-            local restoreVolName
-            restoreVolName="plane-app_${restoreFileName}"
-            echo "Found $BACKUP_FILE"
-
-            local docVol
-            docVol=$(docker volume ls -f "name=$restoreVolName" --format "{{.Name}}" | grep -E "_pgdata|_redisdata|_uploads")
-
-            if [ -z "$docVol" ]; then
-                echo "Skipping: No volume found with name $restoreVolName"
-            else
-                echo ".....Restoring $docVol"
-                restoreSingleVolume "$docVol" "$BACKUP_FOLDER" "$restoreFileName"
-            fi
-        else
-            echo "No .tar.gz files found in the current directory."
-            echo ""
-            echo "Please provide the path to the backup file."
-            echo ""
-            echo "Usage: ./restore.sh /path/to/backup"
-            exit 1
-        fi
-    done
-
-    echo ""
-    echo "Restore completed successfully."
-    echo ""
-}
-
-# if docker-compose is installed
-if command -v docker-compose &> /dev/null
-then
-    COMPOSE_CMD="docker-compose"
-else
-    COMPOSE_CMD="docker compose"
-fi
-
-restoreData "$@"

plane/setup.sh

@@ -2,14 +2,14 @@
 
 BRANCH=${BRANCH:-master}
 SCRIPT_DIR=$PWD
-SERVICE_FOLDER=plane-app
+SERVICE_FOLDER=plane-code
 PLANE_INSTALL_DIR=$PWD/$SERVICE_FOLDER
 export APP_RELEASE=stable
-export DOCKERHUB_USER=makeplane
+export DOCKERHUB_USER=artifacts.plane.so/makeplane
 export PULL_POLICY=${PULL_POLICY:-if_not_present}
 export GH_REPO=makeplane/plane
 export RELEASE_DOWNLOAD_URL="https://github.com/$GH_REPO/releases/download"
-export FALLBACK_DOWNLOAD_URL="https://raw.githubusercontent.com/$GH_REPO/$BRANCH/deploy/selfhost"
+export FALLBACK_DOWNLOAD_URL="https://raw.githubusercontent.com/$GH_REPO/$BRANCH/deployments/cli/community"
 
 CPU_ARCH=$(uname -m)
 OS_NAME=$(uname)
@@ -57,7 +57,7 @@ function spinner() {
 
 function checkLatestRelease(){
     echo "Checking for the latest release..." >&2
-    local latest_release=$(curl -s https://api.github.com/repos/$GH_REPO/releases/latest |  grep -o '"tag_name": "[^"]*"' | sed 's/"tag_name": "//;s/"//g')
+    local latest_release=$(curl -fsSL https://api.github.com/repos/$GH_REPO/releases/latest |  grep -o '"tag_name": "[^"]*"' | sed 's/"tag_name": "//;s/"//g')
     if [ -z "$latest_release" ]; then
         echo "Failed to check for the latest release. Exiting..." >&2
         exit 1
@@ -196,7 +196,7 @@ function buildYourOwnImage(){
     REPO=https://github.com/$GH_REPO.git
     git clone "$REPO" "$PLANE_TEMP_CODE_DIR"  --branch "$BRANCH" --single-branch --depth 1
 
-    cp "$PLANE_TEMP_CODE_DIR/deploy/selfhost/build.yml" "$PLANE_TEMP_CODE_DIR/build.yml"
+    cp "$PLANE_TEMP_CODE_DIR/deployments/cli/community/build.yml" "$PLANE_TEMP_CODE_DIR/build.yml"
 
     cd "$PLANE_TEMP_CODE_DIR" || exit
 
@@ -247,7 +247,7 @@ function download() {
         mv $PLANE_INSTALL_DIR/docker-compose.yaml $PLANE_INSTALL_DIR/archive/$TS.docker-compose.yaml
     fi
 
-    RESPONSE=$(curl -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$RELEASE_DOWNLOAD_URL/$APP_RELEASE/docker-compose.yml?$(date +%s)")
+    RESPONSE=$(curl -fsSL -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$RELEASE_DOWNLOAD_URL/$APP_RELEASE/docker-compose.yml?$(date +%s)")
     BODY=$(echo "$RESPONSE" | sed -e 's/HTTPSTATUS\:.*//g')
     STATUS=$(echo "$RESPONSE" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
 
@@ -255,7 +255,7 @@ function download() {
         echo "$BODY" > $PLANE_INSTALL_DIR/docker-compose.yaml
     else
         # Fallback to download from the raw github url
-        RESPONSE=$(curl -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$FALLBACK_DOWNLOAD_URL/docker-compose.yml?$(date +%s)")
+        RESPONSE=$(curl -fsSL -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$FALLBACK_DOWNLOAD_URL/docker-compose.yml?$(date +%s)")
         BODY=$(echo "$RESPONSE" | sed -e 's/HTTPSTATUS\:.*//g')
         STATUS=$(echo "$RESPONSE" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
 
@@ -269,7 +269,7 @@ function download() {
         fi
     fi
 
-    RESPONSE=$(curl -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$RELEASE_DOWNLOAD_URL/$APP_RELEASE/variables.env?$(date +%s)")
+    RESPONSE=$(curl -fsSL -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$RELEASE_DOWNLOAD_URL/$APP_RELEASE/variables.env?$(date +%s)")
     BODY=$(echo "$RESPONSE" | sed -e 's/HTTPSTATUS\:.*//g')
     STATUS=$(echo "$RESPONSE" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
 
@@ -277,7 +277,7 @@ function download() {
         echo "$BODY" > $PLANE_INSTALL_DIR/variables-upgrade.env
     else
         # Fallback to download from the raw github url
-        RESPONSE=$(curl -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$FALLBACK_DOWNLOAD_URL/variables.env?$(date +%s)")
+        RESPONSE=$(curl -fsSL -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$FALLBACK_DOWNLOAD_URL/variables.env?$(date +%s)")
         BODY=$(echo "$RESPONSE" | sed -e 's/HTTPSTATUS\:.*//g')
         STATUS=$(echo "$RESPONSE" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
 
@@ -366,7 +366,7 @@ function startServices() {
 
     local api_container_id=$(docker container ls -q -f "name=$SERVICE_FOLDER-api")
     local idx2=0
-    while ! docker logs $api_container_id 2>&1 | grep -m 1 -i "Application startup complete" | grep -q ".";
+    while ! docker exec $api_container_id python3 -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/')" > /dev/null 2>&1;
     do
         local message=">> Waiting for API Service to Start"
         local dots=$(printf '%*s' $idx2 | tr ' ' '.')    
@@ -457,12 +457,13 @@ function viewLogs(){
         echo "   8) Redis"
         echo "   9) Postgres"
         echo "   10) Minio"
+        echo "   11) RabbitMQ"
         echo "   0) Back to Main Menu"
         echo 
         read -p "Service: " DOCKER_SERVICE_NAME
 
-        until (( DOCKER_SERVICE_NAME >= 0 && DOCKER_SERVICE_NAME <= 10 )); do
-            echo "Invalid selection. Please enter a number between 1 and 11."
+        until (( DOCKER_SERVICE_NAME >= 0 && DOCKER_SERVICE_NAME <= 11 )); do
+            echo "Invalid selection. Please enter a number between 0 and 11."
             read -p "Service: " DOCKER_SERVICE_NAME
         done
 
@@ -481,6 +482,7 @@ function viewLogs(){
                 8) viewSpecificLogs "plane-redis";;
                 9) viewSpecificLogs "plane-db";;
                 10) viewSpecificLogs "plane-minio";;
+                11) viewSpecificLogs "plane-mq";;
                 0) askForAction;;
                 *) echo "INVALID SERVICE NAME SUPPLIED";;
             esac
@@ -499,49 +501,76 @@ function viewLogs(){
             redis) viewSpecificLogs "plane-redis";;
             postgres) viewSpecificLogs "plane-db";;
             minio) viewSpecificLogs "plane-minio";;
+            rabbitmq) viewSpecificLogs "plane-mq";;
             *) echo "INVALID SERVICE NAME SUPPLIED";;
         esac
     else
         echo "INVALID SERVICE NAME SUPPLIED"
     fi
 }
-function backupSingleVolume() {
-    backupFolder=$1
-    selectedVolume=$2
-    # Backup data from Docker volume to the backup folder
-    # docker run --rm -v "$selectedVolume":/source -v "$backupFolder":/backup busybox sh -c 'cp -r /source/* /backup/'
-    local tobereplaced="plane-app_"
-    local replacewith=""
+function backup_container_dir() {
+    local BACKUP_FOLDER=$1
+    local CONTAINER_NAME=$2
+    local CONTAINER_DATA_DIR=$3
+    local SERVICE_FOLDER=$4
 
-    local svcName="${selectedVolume//$tobereplaced/$replacewith}"
+    echo "Backing up $CONTAINER_NAME data..."
+    local CONTAINER_ID=$(/bin/bash -c "$COMPOSE_CMD -f $DOCKER_FILE_PATH ps -q $CONTAINER_NAME")
+    if [ -z "$CONTAINER_ID" ]; then
+        echo "Error: $CONTAINER_NAME container not found. Make sure the services are running."
+        return 1
+    fi
 
-    docker run --rm \
-        -e TAR_NAME="$svcName" \
-        -v "$selectedVolume":/"$svcName" \
-        -v "$backupFolder":/backup \
-        busybox sh -c 'tar -czf "/backup/${TAR_NAME}.tar.gz" /${TAR_NAME}'
+    # Create a temporary directory for the backup
+    mkdir -p "$BACKUP_FOLDER/$SERVICE_FOLDER"
+
+    # Copy the data directory from the running container
+    echo "Copying $CONTAINER_NAME data directory..."
+    docker cp -q "$CONTAINER_ID:$CONTAINER_DATA_DIR/." "$BACKUP_FOLDER/$SERVICE_FOLDER/"
+    local cp_status=$?
+
+    if [ $cp_status -ne 0 ]; then
+        echo "Error: Failed to copy $SERVICE_FOLDER data"
+        rm -rf $BACKUP_FOLDER/$SERVICE_FOLDER
+        return 1
+    fi
+
+    # Create tar.gz of the data
+    cd "$BACKUP_FOLDER"
+    tar -czf "${SERVICE_FOLDER}.tar.gz" "$SERVICE_FOLDER/"
+    local tar_status=$?
+    if [ $tar_status -eq 0 ]; then
+        rm -rf "$SERVICE_FOLDER/"
+    fi
+    cd - > /dev/null
+
+    if [ $tar_status -ne 0 ]; then
+        echo "Error: Failed to create tar archive"
+        return 1
+    fi
+
+    echo "Successfully backed up $SERVICE_FOLDER data"
 }
+
 function backupData() {
     local datetime=$(date +"%Y%m%d-%H%M")
     local BACKUP_FOLDER=$PLANE_INSTALL_DIR/backup/$datetime
     mkdir -p "$BACKUP_FOLDER"
 
-    volumes=$(docker volume ls -f "name=$SERVICE_FOLDER" --format "{{.Name}}" | grep -E "_pgdata|_redisdata|_uploads")
-    # Check if there are any matching volumes
-    if [ -z "$volumes" ]; then
-        echo "No volumes found starting with '$SERVICE_FOLDER'"
+    # Check if docker-compose.yml exists
+    if [ ! -f "$DOCKER_FILE_PATH" ]; then
+        echo "Error: docker-compose.yml not found at $DOCKER_FILE_PATH"
         exit 1
     fi
 
-    for vol in $volumes; do
-        echo "Backing Up $vol"
-        backupSingleVolume "$BACKUP_FOLDER" "$vol"
-    done
+    backup_container_dir "$BACKUP_FOLDER" "plane-db" "/var/lib/postgresql/data" "pgdata" || exit 1
+    backup_container_dir "$BACKUP_FOLDER" "plane-minio" "/export" "uploads" || exit 1
+    backup_container_dir "$BACKUP_FOLDER" "plane-mq" "/var/lib/rabbitmq" "rabbitmq_data" || exit 1
+    backup_container_dir "$BACKUP_FOLDER" "plane-redis" "/data" "redisdata" || exit 1
 
     echo ""
     echo "Backup completed successfully. Backup files are stored in $BACKUP_FOLDER"
     echo ""
-
 }
 function askForAction() {
     local DEFAULT_ACTION=$1
@@ -628,7 +657,7 @@ if [ -f "$DOCKER_ENV_PATH" ]; then
     CUSTOM_BUILD=$(getEnvValue "CUSTOM_BUILD" "$DOCKER_ENV_PATH")
 
     if [ -z "$DOCKERHUB_USER" ]; then
-        DOCKERHUB_USER=makeplane
+        DOCKERHUB_USER=artifacts.plane.so/makeplane
         updateEnvFile "DOCKERHUB_USER" "$DOCKERHUB_USER" "$DOCKER_ENV_PATH"
     fi
 

plane/update.js

@@ -1,13 +1,28 @@
 import utils from "../utils.js";
 
-await utils.cloneOrPullRepo({
-  repo: "https://github.com/makeplane/plane.git",
-  path: "./repo",
-  branch: "preview",
-});
-
-await utils.copyDir("./repo/deploy/selfhost", "./code");
-await utils.renameFile("./code/variables.env", "./code/.env.example");
+await utils.removeDir("./code");
+await utils.renameDir("./plane-code", "./code");
+await utils.removeDir("./code/archive");
+await utils.renameFile("./code/plane.env", "./code/.env.example");
+await utils.renameFile("./code/docker-compose.yaml", "./code/docker-compose.yml");
 
 await utils.removeContainerNames("./code/docker-compose.yml");
 await utils.removePorts("./code/docker-compose.yml");
+
+await utils.searchReplace(
+  "./code/.env.example",
+  "APP_DOMAIN=localhost",
+  "APP_DOMAIN=$(PRIMARY_DOMAIN)"
+);
+
+await utils.searchReplace(
+  "./code/.env.example",
+  "WEB_URL=http://${APP_DOMAIN}",
+  "WEB_URL=https://$(PRIMARY_DOMAIN)"
+);
+
+await utils.searchReplace(
+  "./code/.env.example",
+  "CORS_ALLOWED_ORIGINS=http://${APP_DOMAIN}",
+  "CORS_ALLOWED_ORIGINS=https://$(PRIMARY_DOMAIN)"
+);

plane/update.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if [ ! -d "./repo" ]; then
-    git clone --depth 1 --branch preview --single-branch https://github.com/makeplane/plane.git repo
-else
-    cd repo
-    git pull
-    cd ..
-fi
-
-cp -r ./repo/deploy/selfhost/. ./code
-mv ./code/variables.env ./code/.env.example
-
-

supabase/code/.env.example

@@ -26,10 +26,17 @@ POSTGRES_PORT=5432
 ############
 # Supavisor -- Database pooler
 ############
+# Port Supavisor listens on for transaction pooling connections
 POOLER_PROXY_PORT_TRANSACTION=6543
+# Maximum number of PostgreSQL connections Supavisor opens per pool
 POOLER_DEFAULT_POOL_SIZE=20
+# Maximum number of client connections Supavisor accepts per pool
 POOLER_MAX_CLIENT_CONN=100
+# Unique tenant identifier
 POOLER_TENANT_ID=your-tenant-id
+# Pool size for internal metadata storage used by Supavisor
+# This is separate from client connections and used only by Supavisor itself
+POOLER_DB_POOL_SIZE=5
 
 
 ############
@@ -52,7 +59,7 @@ PGRST_DB_SCHEMAS=public,storage,graphql_public
 ############
 
 ## General
-SITE_URL=http://localhost:3000
+SITE_URL=https://$(PRIMARY_DOMAIN)
 ADDITIONAL_REDIRECT_URLS=
 JWT_EXPIRY=3600
 DISABLE_SIGNUP=false
@@ -106,14 +113,14 @@ FUNCTIONS_VERIFY_JWT=false
 
 
 ############
-# Logs - Configuration for Logflare
+# Logs - Configuration for Analytics
 # Please refer to https://supabase.com/docs/reference/self-hosting-analytics/introduction
 ############
 
-LOGFLARE_LOGGER_BACKEND_API_KEY=your-super-secret-and-long-logflare-key
-
 # Change vector.toml sinks to reflect this change
-LOGFLARE_API_KEY=your-super-secret-and-long-logflare-key
+# these cannot be the same value
+LOGFLARE_PUBLIC_ACCESS_TOKEN=your-super-secret-and-long-logflare-key-public
+LOGFLARE_PRIVATE_ACCESS_TOKEN=your-super-secret-and-long-logflare-key-private
 
 # Docker socket location - this value will differ depending on your OS
 DOCKER_SOCKET_LOCATION=/var/run/docker.sock

supabase/code/dev/docker-compose.dev.yml

@@ -4,7 +4,7 @@ services:
   studio:
     build:
       context: ..
-      dockerfile: studio/Dockerfile
+      dockerfile: apps/studio/Dockerfile
       target: dev
     ports:
       - 8082:8082

supabase/code/docker-compose.yml

@@ -10,7 +10,7 @@ name: supabase
 services:
 
   studio:
-    image: supabase/studio:20250113-83c9420
+    image: supabase/studio:2025.06.30-sha-6f5982d
     restart: unless-stopped
     healthcheck:
       test:
@@ -18,8 +18,8 @@ services:
           "CMD",
           "node",
           "-e",
-          "fetch('http://studio:3000/api/profile').then((r) => {if (r.status
-            !== 200) throw new Error(r.status)})"
+          "fetch('http://studio:3000/api/platform/profile').then((r) => {if
+            (r.status !== 200) throw new Error(r.status)})"
         ]
       timeout: 10s
       interval: 5s
@@ -41,7 +41,7 @@ services:
       SUPABASE_SERVICE_KEY: ${SERVICE_ROLE_KEY}
       AUTH_JWT_SECRET: ${JWT_SECRET}
 
-      LOGFLARE_API_KEY: ${LOGFLARE_API_KEY}
+      LOGFLARE_PRIVATE_ACCESS_TOKEN: ${LOGFLARE_PRIVATE_ACCESS_TOKEN}
       LOGFLARE_URL: http://analytics:4000
       NEXT_PUBLIC_ENABLE_LOGS: true
       # Comment to use Big Query backend for analytics
@@ -54,7 +54,7 @@ services:
     restart: unless-stopped
     volumes:
       # https://github.com/supabase/supabase/issues/12661
-      - ./volumes/api/kong.yml:/home/kong/temp.yml:ro
+      - ./volumes/api/kong.yml:/home/kong/temp.yml:ro,z
     depends_on:
       analytics:
         condition: service_healthy
@@ -75,7 +75,7 @@ services:
       /docker-entrypoint.sh kong docker-start'
 
   auth:
-    image: supabase/gotrue:v2.167.0
+    image: supabase/gotrue:v2.177.0
     restart: unless-stopped
     healthcheck:
       test:
@@ -157,7 +157,7 @@ services:
       # GOTRUE_HOOK_SEND_EMAIL_SECRETS: "v1,whsec_VGhpcyBpcyBhbiBleGFtcGxlIG9mIGEgc2hvcnRlciBCYXNlNjQgc3RyaW5n"
 
   rest:
-    image: postgrest/postgrest:v12.2.0
+    image: postgrest/postgrest:v12.2.12
     restart: unless-stopped
     depends_on:
       db:
@@ -177,7 +177,7 @@ services:
 
   realtime:
     # This container name looks inconsistent but is correct because realtime constructs tenant id by parsing the subdomain
-    image: supabase/realtime:v2.34.7
+    image: supabase/realtime:v2.34.47
     restart: unless-stopped
     depends_on:
       db:
@@ -221,7 +221,7 @@ services:
 
   # To use S3 backed storage: docker compose -f docker-compose.yml -f docker-compose.s3.yml up
   storage:
-    image: supabase/storage-api:v1.14.5
+    image: supabase/storage-api:v1.25.7
     restart: unless-stopped
     volumes:
       - ./volumes/storage:/var/lib/storage:z
@@ -279,7 +279,7 @@ services:
       IMGPROXY_ENABLE_WEBP_DETECTION: ${IMGPROXY_ENABLE_WEBP_DETECTION}
 
   meta:
-    image: supabase/postgres-meta:v0.84.2
+    image: supabase/postgres-meta:v0.91.0
     restart: unless-stopped
     depends_on:
       db:
@@ -296,7 +296,7 @@ services:
       PG_META_DB_PASSWORD: ${POSTGRES_PASSWORD}
 
   functions:
-    image: supabase/edge-runtime:v1.66.5
+    image: supabase/edge-runtime:v1.67.4
     restart: unless-stopped
     volumes:
       - ./volumes/functions:/home/deno/functions:Z
@@ -314,7 +314,7 @@ services:
     command: [ "start", "--main-service", "/home/deno/functions/main" ]
 
   analytics:
-    image: supabase/logflare:1.4.0
+    image: supabase/logflare:1.14.2
     restart: unless-stopped
     # Uncomment to use Big Query backend for analytics
     # volumes:
@@ -339,7 +339,8 @@ services:
       DB_PORT: ${POSTGRES_PORT}
       DB_PASSWORD: ${POSTGRES_PASSWORD}
       DB_SCHEMA: _analytics
-      LOGFLARE_API_KEY: ${LOGFLARE_API_KEY}
+      LOGFLARE_PUBLIC_ACCESS_TOKEN: ${LOGFLARE_PUBLIC_ACCESS_TOKEN}
+      LOGFLARE_PRIVATE_ACCESS_TOKEN: ${LOGFLARE_PRIVATE_ACCESS_TOKEN}
       LOGFLARE_SINGLE_TENANT: true
       LOGFLARE_SUPABASE_MODE: true
       LOGFLARE_MIN_CLUSTER_SIZE: 1
@@ -354,7 +355,7 @@ services:
 
       # Comment out everything below this point if you are using an external Postgres database
   db:
-    image: supabase/postgres:15.8.1.020
+    image: supabase/postgres:15.8.1.060
     restart: unless-stopped
     volumes:
       - ./volumes/db/realtime.sql:/docker-entrypoint-initdb.d/migrations/99-realtime.sql:Z
@@ -405,8 +406,8 @@ services:
     image: timberio/vector:0.28.1-alpine
     restart: unless-stopped
     volumes:
-      - ./volumes/logs/vector.yml:/etc/vector/vector.yml:ro
-      - ${DOCKER_SOCKET_LOCATION}:/var/run/docker.sock:ro
+      - ./volumes/logs/vector.yml:/etc/vector/vector.yml:ro,z
+      - ${DOCKER_SOCKET_LOCATION}:/var/run/docker.sock:ro,z
     healthcheck:
       test:
         [
@@ -421,15 +422,17 @@ services:
       interval: 5s
       retries: 3
     environment:
-      LOGFLARE_API_KEY: ${LOGFLARE_API_KEY}
+      LOGFLARE_PUBLIC_ACCESS_TOKEN: ${LOGFLARE_PUBLIC_ACCESS_TOKEN}
     command: [ "--config", "/etc/vector/vector.yml" ]
+    security_opt:
+      - "label=disable"
 
   # Update the DATABASE_URL if you are using an external Postgres database
   supavisor:
-    image: supabase/supavisor:1.1.56
+    image: supabase/supavisor:2.5.7
     restart: unless-stopped
     volumes:
-      - ./volumes/pooler/pooler.exs:/etc/pooler/pooler.exs:ro
+      - ./volumes/pooler/pooler.exs:/etc/pooler/pooler.exs:ro,z
     healthcheck:
       test:
         [
@@ -454,7 +457,7 @@ services:
       POSTGRES_PORT: ${POSTGRES_PORT}
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      DATABASE_URL: ecto://supabase_admin:${POSTGRES_PASSWORD}@db:${POSTGRES_PORT}/_supabase
+      DATABASE_URL: ecto://supabase_admin:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/_supabase
       CLUSTER_POSTGRES: true
       SECRET_KEY_BASE: ${SECRET_KEY_BASE}
       VAULT_ENC_KEY: ${VAULT_ENC_KEY}
@@ -466,6 +469,7 @@ services:
       POOLER_DEFAULT_POOL_SIZE: ${POOLER_DEFAULT_POOL_SIZE}
       POOLER_MAX_CLIENT_CONN: ${POOLER_MAX_CLIENT_CONN}
       POOLER_POOL_MODE: transaction
+      DB_POOL_SIZE: ${POOLER_DB_POOL_SIZE}
     command:
       [
         "/bin/sh",

supabase/code/volumes/logs/vector.yml

@@ -165,7 +165,9 @@ sinks:
     method: 'post'
     request:
       retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=gotrue.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+      headers:
+        x-api-key: ${LOGFLARE_PUBLIC_ACCESS_TOKEN?LOGFLARE_PUBLIC_ACCESS_TOKEN is required}
+    uri: 'http://analytics:4000/api/logs?source_name=gotrue.logs.prod'
   logflare_realtime:
     type: 'http'
     inputs:
@@ -175,7 +177,9 @@ sinks:
     method: 'post'
     request:
       retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=realtime.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+      headers:
+        x-api-key: ${LOGFLARE_PUBLIC_ACCESS_TOKEN?LOGFLARE_PUBLIC_ACCESS_TOKEN is required}
+    uri: 'http://analytics:4000/api/logs?source_name=realtime.logs.prod'
   logflare_rest:
     type: 'http'
     inputs:
@@ -185,7 +189,9 @@ sinks:
     method: 'post'
     request:
       retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=postgREST.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+      headers:
+        x-api-key: ${LOGFLARE_PUBLIC_ACCESS_TOKEN?LOGFLARE_PUBLIC_ACCESS_TOKEN is required}
+    uri: 'http://analytics:4000/api/logs?source_name=postgREST.logs.prod'
   logflare_db:
     type: 'http'
     inputs:
@@ -195,10 +201,12 @@ sinks:
     method: 'post'
     request:
       retry_max_duration_secs: 10
+      headers:
+        x-api-key: ${LOGFLARE_PUBLIC_ACCESS_TOKEN?LOGFLARE_PUBLIC_ACCESS_TOKEN is required}
     # We must route the sink through kong because ingesting logs before logflare is fully initialised will
     # lead to broken queries from studio. This works by the assumption that containers are started in the
     # following order: vector > db > logflare > kong
-    uri: 'http://kong:8000/analytics/v1/api/logs?source_name=postgres.logs&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+    uri: 'http://kong:8000/analytics/v1/api/logs?source_name=postgres.logs'
   logflare_functions:
     type: 'http'
     inputs:
@@ -208,7 +216,9 @@ sinks:
     method: 'post'
     request:
       retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=deno-relay-logs&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+      headers:
+        x-api-key: ${LOGFLARE_PUBLIC_ACCESS_TOKEN?LOGFLARE_PUBLIC_ACCESS_TOKEN is required}
+    uri: 'http://analytics:4000/api/logs?source_name=deno-relay-logs'
   logflare_storage:
     type: 'http'
     inputs:
@@ -218,7 +228,9 @@ sinks:
     method: 'post'
     request:
       retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=storage.logs.prod.2&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+      headers:
+        x-api-key: ${LOGFLARE_PUBLIC_ACCESS_TOKEN?LOGFLARE_PUBLIC_ACCESS_TOKEN is required}
+    uri: 'http://analytics:4000/api/logs?source_name=storage.logs.prod.2'
   logflare_kong:
     type: 'http'
     inputs:
@@ -229,4 +241,6 @@ sinks:
     method: 'post'
     request:
       retry_max_duration_secs: 10
-    uri: 'http://analytics:4000/api/logs?source_name=cloudflare.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+      headers:
+        x-api-key: ${LOGFLARE_PUBLIC_ACCESS_TOKEN?LOGFLARE_PUBLIC_ACCESS_TOKEN is required}
+    uri: 'http://analytics:4000/api/logs?source_name=cloudflare.logs.prod'

supabase/update.js

@@ -5,3 +5,9 @@ await utils.copyDir("./repo/docker", "./code");
 
 await utils.removeContainerNames("./code/docker-compose.yml");
 await utils.removePorts("./code/docker-compose.yml");
+
+await utils.searchReplace(
+  "./code/.env.example",
+  "SITE_URL=http://localhost:3000",
+  "SITE_URL=https://$(PRIMARY_DOMAIN)"
+);

supabase/update.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ ! -d "./repo" ]; then
-    git clone --depth 1 --branch master --single-branch https://github.com/supabase/supabase repo
-else
-    cd repo
-    git pull
-    cd ..
-fi
-
-cp -r ./repo/docker/. ./code

twenty/README.md

@@ -1,4 +0,0 @@
-# Twenty
-
-- copied from https://github.com/twentyhq/twenty
-- removed `ports`

twenty/code/.env.example

@@ -1,19 +0,0 @@
-TAG=latest
-
-#PG_DATABASE_USER=postgres
-#PG_DATABASE_PASSWORD=replace_me_with_a_strong_password_without_special_characters
-#PG_DATABASE_HOST=db
-#PG_DATABASE_PORT=5432
-#REDIS_URL=redis://redis:6379
-
-SERVER_URL=http://localhost:3000
-SIGN_IN_PREFILLED=false
-
-# Use openssl rand -base64 32 for each secret
-# APP_SECRET=replace_me_with_a_random_string
-
-STORAGE_TYPE=local
-
-# STORAGE_S3_REGION=eu-west3
-# STORAGE_S3_NAME=my-bucket
-# STORAGE_S3_ENDPOINT=

twenty/code/Makefile

@@ -1,14 +0,0 @@
-prod-build:
-	@cd ../.. && docker build -f ./packages/twenty-docker/twenty/Dockerfile --tag twenty . && cd -
-
-prod-run:
-	@docker run -d -p 3000:3000 --name twenty twenty
-
-prod-postgres-run:
-	@docker run -d -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres --name twenty-postgres twenty-postgres
-
-prod-website-build:
-	@cd ../.. && docker build -f ./packages/twenty-docker/twenty-website/Dockerfile --tag twenty-website . && cd -
-
-prod-website-run:
-	@docker run -d -p 3000:3000 --name twenty-website twenty-website

twenty/code/docker-compose.yml

@@ -1,88 +0,0 @@
-name: twenty
-
-services:
-  change-vol-ownership:
-    image: ubuntu
-    user: root
-    volumes:
-      - server-local-data:/tmp/server-local-data
-      - docker-data:/tmp/docker-data
-    command: >
-      bash -c " chown -R 1000:1000 /tmp/server-local-data && chown -R 1000:1000
-      /tmp/docker-data"
-
-  server:
-    image: twentycrm/twenty:${TAG:-latest}
-    volumes:
-      - server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage}
-      - docker-data:/app/docker-data
-    environment:
-      PORT: 3000
-      PG_DATABASE_URL: postgres://${PG_DATABASE_USER:-postgres}:${PG_DATABASE_PASSWORD:-postgres}@${PG_DATABASE_HOST:-db}:${PG_DATABASE_PORT:-5432}/default
-      SERVER_URL: ${SERVER_URL}
-      REDIS_URL: ${REDIS_URL:-redis://redis:6379}
-
-      STORAGE_TYPE: ${STORAGE_TYPE}
-      STORAGE_S3_REGION: ${STORAGE_S3_REGION}
-      STORAGE_S3_NAME: ${STORAGE_S3_NAME}
-      STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT}
-
-      APP_SECRET: ${APP_SECRET}
-    depends_on:
-      change-vol-ownership:
-        condition: service_completed_successfully
-      db:
-        condition: service_healthy
-    healthcheck:
-      test: curl --fail http://localhost:3000/healthz
-      interval: 5s
-      timeout: 5s
-      retries: 10
-    restart: always
-
-  worker:
-    image: twentycrm/twenty:${TAG:-latest}
-    command: [ "yarn", "worker:prod" ]
-    environment:
-      PG_DATABASE_URL: postgres://${PG_DATABASE_USER:-postgres}:${PG_DATABASE_PASSWORD:-postgres}@${PG_DATABASE_HOST:-db}:${PG_DATABASE_PORT:-5432}/default
-      SERVER_URL: ${SERVER_URL}
-      REDIS_URL: ${REDIS_URL:-redis://redis:6379}
-      DISABLE_DB_MIGRATIONS: "true" # it already runs on the server
-
-      STORAGE_TYPE: ${STORAGE_TYPE}
-      STORAGE_S3_REGION: ${STORAGE_S3_REGION}
-      STORAGE_S3_NAME: ${STORAGE_S3_NAME}
-      STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT}
-
-      APP_SECRET: ${APP_SECRET}
-    depends_on:
-      db:
-        condition: service_healthy
-      server:
-        condition: service_healthy
-    restart: always
-
-  db:
-    image: twentycrm/twenty-postgres-spilo:${TAG:-latest}
-    volumes:
-      - db-data:/home/postgres/pgdata
-    environment:
-      PGUSER_SUPERUSER: ${PG_DATABASE_USER:-postgres}
-      PGPASSWORD_SUPERUSER: ${PG_DATABASE_PASSWORD:-postgres}
-      ALLOW_NOSSL: "true"
-      SPILO_PROVIDER: "local"
-    healthcheck:
-      test: pg_isready -U ${PG_DATABASE_USER:-postgres} -h localhost -d postgres
-      interval: 5s
-      timeout: 5s
-      retries: 10
-    restart: always
-
-  redis:
-    image: redis
-    restart: always
-
-volumes:
-  docker-data:
-  db-data:
-  server-local-data:

twenty/code/k8s/README.md

@@ -1,113 +0,0 @@
-# README
-
-## Overview
-
-This repository contains Kubernetes manifests and Terraform files to help you deploy and manage the TwentyCRM application. The files are located in the `packages/twenty-docker/k8s` directory.
-
-## Prerequisites
-
-Before using these files, ensure you have the following installed and configured on your system:
-
-- Kubernetes cluster (e.g., Minikube, EKS, GKE)
-- kubectl
-- Terraform
-- Docker
-
-## Setup Instructions
-
-### Step 1: Clone the Repository
-
-Clone the repository to your local machine:
-
-``` bash
-git clone https://github.com/twentyhq/twenty.git
-cd twentycrm/packages/twenty-docker/k8s
-```
-
-### Step 2: Customize the Manifests and Terraform Files
-
-**Important:** These files require customization for your specific implementation. Update the placeholders and configurations according to your environment and requirements.
-
-### Step 3: Deploy with Terraform
-
-1. Navigate to the Terraform directory:
-
-    ```bash
-    cd terraform
-    ```
-
-2. Initialize Terraform:
-
-    ```bash
-    terraform init
-    ```
-
-3. Plan the deployment:
-
-    ```bash
-    terraform plan
-    ```
-
-4. Apply the deployment:
-
-    ```bash
-    terraform apply
-    ```
-
-## OR
-
-### Step 3: Deploy with Kubernetes Manifests
-
-1. Navigate to the Kubernetes manifests directory:
-
-    ```bash
-    cd ../k8s
-    ```
-
-2. Create Server Secret
-
-    ``` bash
-    kubectl create secret generic -n twentycrm tokens --from-literal accessToken=changeme --from-literal loginToken="changeme" --from-literal refreshToken="changeme" --from-literal fileToken="changeme"
-    ```
-
-3. Apply the manifests:
-
-    ```bash
-    kubectl apply -f .
-    ```
-
-## Customization
-
-### Kubernetes Manifests
-
-- **Namespace:** Update the `namespace` in the manifests as needed.
-- **Resource Limits:** Adjust the resource limits and requests according to your application's requirements.
-- **Environment Variables:** Configure server tokens in the `Secret` command above.
-
-### Terraform Files
-
-- **Variables:** Update the variables in the `variables.tf` file to match your environment.
-- **Locals:** Update the locals in the `main.tf` file to match your environment.
-- **Providers:** Ensure the provider configurations (e.g., AWS, GCP) are correct for your setup.
-- **Resources:** Modify the resource definitions as needed to fit your infrastructure.
-
-## Troubleshooting
-
-### Common Issues
-
-- **Connectivity:** Ensure your Kubernetes cluster is accessible and configured correctly.
-- **Permissions:** Verify that you have the necessary permissions to deploy resources in your cloud provider.
-- **Resource Limits:** Adjust resource limits if you encounter issues related to insufficient resources.
-
-### Logs and Debugging
-
-- Use `kubectl logs` to check the logs of your Kubernetes pods.
-- Use `terraform show` and `terraform state` to inspect your Terraform state and configurations.
-
-## Conclusion
-
-This setup provides a basic structure for deploying the TwentyCRM application using Kubernetes and Terraform. Ensure you thoroughly customize the manifests and Terraform files to suit your specific needs. For any issues or questions, please refer to the official documentation of Kubernetes and Terraform or seek support from your cloud provider.
-
----
-
-Feel free to contribute and improve this repository by submitting pull requests or opening issues. Happy deploying!

twenty/code/k8s/manifests/deployment-db.yaml

@@ -1,58 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: twentycrm-db
-  name: twentycrm-db
-  namespace: twentycrm
-spec:
-  progressDeadlineSeconds: 600
-  replicas: 1
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
-  selector:
-    matchLabels:
-      app: twentycrm-db
-  template:
-    metadata:
-      labels:
-        app: twentycrm-db
-    spec:
-      volumes:
-        - name: twentycrm-db-data
-          persistentVolumeClaim:
-            claimName: twentycrm-db-pvc
-      containers:
-        - name: twentycrm
-          image: twentycrm/twenty-postgres-spilo:latest
-          imagePullPolicy: Always
-          env:
-            - name: PGUSER_SUPERUSER
-              value: "postgres"
-            - name: PGPASSWORD_SUPERUSER
-              value: "postgres"
-            - name: SPILO_PROVIDER
-              value: "local"
-            - name: ALLOW_NOSSL
-              value: "true"
-          ports:
-            - containerPort: 5432
-              name: tcp
-              protocol: TCP
-          resources:
-            requests:
-              memory: "256Mi"
-              cpu: "250m"
-            limits:
-              memory: "1024Mi"
-              cpu: "1000m"
-          stdin: true
-          tty: true
-          volumeMounts:
-            - mountPath: /home/postgres/pgdata
-              name: twentycrm-db-data
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always

twenty/code/k8s/manifests/deployment-redis.yaml

@@ -1,44 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: twentycrm-redis
-  name: twentycrm-redis
-  namespace: twentycrm
-spec:
-  progressDeadlineSeconds: 600
-  replicas: 1
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
-  selector:
-    matchLabels:
-      app: twentycrm-redis
-  template:
-    metadata:
-      labels:
-        app: twentycrm-redis
-    spec:
-      containers:
-        - name: redis
-          image: redis/redis-stack-server:latest
-          imagePullPolicy: Always
-          env:
-            - name: PORT
-              value: 6379
-          ports:
-            - containerPort: 6379
-              name: redis
-              protocol: TCP
-          resources:
-            requests:
-              memory: "1024Mi"
-              cpu: "250m"
-            limits:
-              memory: "2048Mi"
-              cpu: "500m"
-
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always

twenty/code/k8s/manifests/deployment-server.yaml

@@ -1,78 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: twentycrm-server
-  name: twentycrm-server
-  namespace: twentycrm
-spec:
-  progressDeadlineSeconds: 600
-  replicas: 1
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
-  selector:
-    matchLabels:
-      app: twentycrm-server
-  template:
-    metadata:
-      labels:
-        app: twentycrm-server
-    spec:
-      volumes:
-        - name: twentycrm-server-data
-          persistentVolumeClaim:
-            claimName: twentycrm-server-pvc
-        - name: twentycrm-docker-data
-          persistentVolumeClaim:
-            claimName: twentycrm-docker-data-pvc
-      containers:
-        - name: twentycrm
-          image: twentycrm/twenty:latest
-          imagePullPolicy: Always
-          env:
-            - name: PORT
-              value: 3000
-            - name: SERVER_URL
-              value: "https://crm.example.com:443"
-            - name: "PG_DATABASE_URL"
-              value: "postgres://postgres:postgres@twentycrm-db.twentycrm.svc.cluster.local/default"
-            - name: "REDIS_URL"
-              value: "redis://twentycrm-redis.twentycrm.svc.cluster.local:6379"
-            - name: SIGN_IN_PREFILLED
-              value: "false"
-            - name: STORAGE_TYPE
-              value: "local"
-            - name: "MESSAGE_QUEUE_TYPE"
-              value: "bull-mq"
-            - name: "ACCESS_TOKEN_EXPIRES_IN"
-              value: "7d"
-            - name: "LOGIN_TOKEN_EXPIRES_IN"
-              value: "1h"
-            - name: APP_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: tokens
-                  key: accessToken
-          ports:
-            - containerPort: 3000
-              name: http-tcp
-              protocol: TCP
-          resources:
-            requests:
-              memory: "256Mi"
-              cpu: "250m"
-            limits:
-              memory: "1024Mi"
-              cpu: "1000m"
-          stdin: true
-          tty: true
-          volumeMounts:
-            - mountPath: /app/docker-data
-              name: twentycrm-docker-data
-            - mountPath: /app/packages/twenty-server/.local-storage
-              name: twentycrm-server-data
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always

twenty/code/k8s/manifests/deployment-worker.yaml

@@ -1,61 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: twentycrm-worker
-  name: twentycrm-worker
-  namespace: twentycrm
-spec:
-  progressDeadlineSeconds: 600
-  replicas: 1
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
-  selector:
-    matchLabels:
-      app: twentycrm-worker
-  template:
-    metadata:
-      labels:
-        app: twentycrm-worker
-    spec:
-      containers:
-        - name: twentycrm
-          image: twentycrm/twenty:latest
-          imagePullPolicy: Always
-          env:
-            - name: SERVER_URL
-              value: "https://crm.example.com:443"
-            - name: PG_DATABASE_URL
-              value: "postgres://postgres:postgres@twentycrm-db.twentycrm.svc.cluster.local/default"
-            - name: DISABLE_DB_MIGRATIONS
-              value: "false" # it already runs on the server
-            - name: STORAGE_TYPE
-              value: "local"
-            - name: "MESSAGE_QUEUE_TYPE"
-              value: "bull-mq"
-            - name: "CACHE_STORAGE_TYPE"
-              value: "redis"
-            - name: "REDIS_URL"
-              value: "redis://twentycrm-redis.twentycrm.svc.cluster.local:6379"
-            - name: APP_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: tokens
-                  key: accessToken
-          command:
-            - yarn
-            - worker:prod
-          resources:
-            requests:
-              memory: "1024Mi"
-              cpu: "250m"
-            limits:
-              memory: "2048Mi"
-              cpu: "1000m"
-          stdin: true
-          tty: true
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always

twenty/code/k8s/manifests/ingress.yaml

@@ -1,24 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: twentycrm
-  namespace: twentycrm
-  annotations:
-    nginx.ingress.kubernetes.io/configuration-snippet: |
-      more_set_headers "X-Forwarded-For $http_x_forwarded_for";
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
-    kubernetes.io/ingress.class: "nginx"
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
-spec:
-  ingressClassName: nginx
-  rules:
-    - host: crm.example.com
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: twentycrm-server
-                port:
-                  name: http-tcp

twenty/code/k8s/manifests/pv-db.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: twentycrm-db-pv
-spec:
-  storageClassName: default
-  capacity:
-    storage: 10Gi
-  accessModes:
-    - ReadWriteOnce
-  persistentVolumeReclaimPolicy: Retain

twenty/code/k8s/manifests/pv-docker-data.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: twentycrm-docker-data-pv
-spec:
-  storageClassName: default
-  capacity:
-    storage: 100Mi
-  accessModes:
-    - ReadWriteOnce
-  persistentVolumeReclaimPolicy: Retain

twenty/code/k8s/manifests/pv-server.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: twentycrm-server-pv
-  namespace: twentycrm
-spec:
-  storageClassName: default
-  capacity:
-    storage: 10Gi
-  accessModes:
-    - ReadWriteOnce
-  persistentVolumeReclaimPolicy: Retain

twenty/code/k8s/manifests/pvc-db.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: twentycrm-db-pvc
-  namespace: twentycrm
-spec:
-  storageClassName: default
-  volumeName: twentycrm-db-pv
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 10Gi

twenty/code/k8s/manifests/pvc-docker-data.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: twentycrm-docker-data-pvc
-  namespace: twentycrm
-spec:
-  storageClassName: default
-  volumeName: twentycrm-docker-data-pv
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Mi

twenty/code/k8s/manifests/pvc-server.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: twentycrm-server-pvc
-  namespace: twentycrm
-spec:
-  storageClassName: default
-  volumeName: twentycrm-server-pv
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 10Gi

twenty/code/k8s/manifests/service-db.yaml

@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: twentycrm-db
-  namespace: twentycrm
-spec:
-  internalTrafficPolicy: Cluster
-  ports:
-    - port: 5432
-      protocol: TCP
-      targetPort: 5432
-  selector:
-    app: twentycrm-db
-  sessionAffinity: ClientIP
-  sessionAffinityConfig:
-    clientIP:
-      timeoutSeconds: 10800
-  type: ClusterIP

twenty/code/k8s/manifests/service-redis.yaml

@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: twentycrm-redis
-  namespace: twentycrm
-spec:
-  internalTrafficPolicy: Cluster
-  ports:
-    - port: 6379
-      protocol: TCP
-      targetPort: 6379
-  selector:
-    app: twentycrm-redis
-  sessionAffinity: ClientIP
-  sessionAffinityConfig:
-    clientIP:
-      timeoutSeconds: 10800
-  type: ClusterIP

twenty/code/k8s/manifests/service-server.yaml

@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: twentycrm-server
-  namespace: twentycrm
-spec:
-  internalTrafficPolicy: Cluster
-  ports:
-    - name: http-tcp
-      port: 3000
-      protocol: TCP
-      targetPort: 3000
-  selector:
-    app: twentycrm-server
-  sessionAffinity: ClientIP
-  sessionAffinityConfig:
-    clientIP:
-      timeoutSeconds: 10800
-  type: ClusterIP

twenty/code/k8s/terraform/.terraform-docs.yml

@@ -1,48 +0,0 @@
-formatter: "markdown table" # this is required
-
-version: ""
-
-header-from: main.tf
-
-recursive:
-  enabled: false
-  path: modules
-
-output:
-  file: "README.md"
-  mode: inject
-  template: |-
-    <!-- BEGIN_TF_DOCS -->
-    # TwentyCRM Terraform Docs
-
-    This file was generated by [terraform-docs](https://terraform-docs.io/), for more information on how to install, configure, and use visit their website.
-
-    To update this `README.md` after changes to the Terraform code in this folder, run: `terraform-docs -c `./.terraform-docs.yml .`
-
-    To make configuration changes to how this doc is generated, see `./.terraform-docs.yml`
-
-    {{ .Content }}
-    <!-- END_TF_DOCS -->
-
-output-values:
-  enabled: false
-  from: "outputs.tf"
-
-sort:
-  enabled: true
-  by: required
-
-settings:
-  anchor: true
-  color: true
-  default: true
-  description: true
-  escape: true
-  hide-empty: true
-  html: true
-  indent: 2
-  lockfile: true
-  read-comments: true
-  required: true
-  sensitive: true
-  type: true

twenty/code/k8s/terraform/README.md

@@ -1,73 +0,0 @@
-<!-- BEGIN_TF_DOCS -->
-# TwentyCRM Terraform Docs
-
-This file was generated by [terraform-docs](https://terraform-docs.io/), for more information on how to install, configure, and use visit their website.
-
-To update this `README.md` after changes to the Terraform code in this folder, run: `terraform-docs -c `./.terraform-docs.yml .`
-
-To make configuration changes to how this doc is generated, see `./.terraform-docs.yml`
-
-## Requirements
-
-| Name | Version |
-|------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.2 |
-| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.32.0 |
-| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.6.3 |
-
-## Providers
-
-| Name | Version |
-|------|---------|
-| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.32.0 |
-| <a name="provider_random"></a> [random](#provider\_random) | >= 3.6.3 |
-
-## Resources
-
-| Name | Type |
-|------|------|
-| [kubernetes_deployment.twentycrm_db](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/deployment) | resource |
-| [kubernetes_deployment.twentycrm_redis](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/deployment) | resource |
-| [kubernetes_deployment.twentycrm_server](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/deployment) | resource |
-| [kubernetes_deployment.twentycrm_worker](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/deployment) | resource |
-| [kubernetes_ingress.twentycrm](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/ingress) | resource |
-| [kubernetes_namespace.twentycrm](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
-| [kubernetes_persistent_volume.db](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/persistent_volume) | resource |
-| [kubernetes_persistent_volume.docker_data](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/persistent_volume) | resource |
-| [kubernetes_persistent_volume.server](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/persistent_volume) | resource |
-| [kubernetes_persistent_volume_claim.db](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/persistent_volume_claim) | resource |
-| [kubernetes_persistent_volume_claim.docker_data](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/persistent_volume_claim) | resource |
-| [kubernetes_persistent_volume_claim.server](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/persistent_volume_claim) | resource |
-| [kubernetes_secret.twentycrm_tokens](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/secret) | resource |
-| [kubernetes_service.twentycrm_db](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/service) | resource |
-| [kubernetes_service.twentycrm_redis](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/service) | resource |
-| [kubernetes_service.twentycrm_server](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/service) | resource |
-| [random_bytes.this](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/bytes) | resource |
-
-## Inputs
-
-| Name | Description | Type | Default | Required |
-|------|-------------|------|---------|:--------:|
-| <a name="input_twentycrm_app_hostname"></a> [twentycrm\_app\_hostname](#input\_twentycrm\_app\_hostname) | The protocol, DNS fully qualified hostname, and port used to access TwentyCRM in your environment. Ex: https://crm.example.com:443 | `string` | n/a | yes |
-| <a name="input_twentycrm_pgdb_admin_password"></a> [twentycrm\_pgdb\_admin\_password](#input\_twentycrm\_pgdb\_admin\_password) | TwentyCRM password for postgres database. | `string` | n/a | yes |
-| <a name="input_twentycrm_app_name"></a> [twentycrm\_app\_name](#input\_twentycrm\_app\_name) | A friendly name prefix to use for every component deployed. | `string` | `"twentycrm"` | no |
-| <a name="input_twentycrm_db_image"></a> [twentycrm\_db\_image](#input\_twentycrm\_db\_image) | TwentyCRM image for database deployment. This defaults to latest. | `string` | `"twentycrm/twenty-postgres-spilo:latest"` | no |
-| <a name="input_twentycrm_db_pv_capacity"></a> [twentycrm\_db\_pv\_capacity](#input\_twentycrm\_db\_pv\_capacity) | Storage capacity provisioned for database persistent volume. | `string` | `"10Gi"` | no |
-| <a name="input_twentycrm_db_pv_path"></a> [twentycrm\_db\_pv\_path](#input\_twentycrm\_db\_pv\_path) | Local path to use to store the physical volume if using local storage on nodes. | `string` | `""` | no |
-| <a name="input_twentycrm_db_pvc_requests"></a> [twentycrm\_db\_pvc\_requests](#input\_twentycrm\_db\_pvc\_requests) | Storage capacity reservation for database persistent volume claim. | `string` | `"10Gi"` | no |
-| <a name="input_twentycrm_db_replicas"></a> [twentycrm\_db\_replicas](#input\_twentycrm\_db\_replicas) | Number of replicas for the TwentyCRM database deployment. This defaults to 1. | `number` | `1` | no |
-| <a name="input_twentycrm_docker_data_mount_path"></a> [twentycrm\_docker\_data\_mount\_path](#input\_twentycrm\_docker\_data\_mount\_path) | TwentyCRM mount path for servers application data. Defaults to '/app/docker-data'. | `string` | `"/app/docker-data"` | no |
-| <a name="input_twentycrm_docker_data_pv_capacity"></a> [twentycrm\_docker\_data\_pv\_capacity](#input\_twentycrm\_docker\_data\_pv\_capacity) | Storage capacity provisioned for server persistent volume. | `string` | `"10Gi"` | no |
-| <a name="input_twentycrm_docker_data_pv_path"></a> [twentycrm\_docker\_data\_pv\_path](#input\_twentycrm\_docker\_data\_pv\_path) | Local path to use to store the physical volume if using local storage on nodes. | `string` | `""` | no |
-| <a name="input_twentycrm_docker_data_pvc_requests"></a> [twentycrm\_docker\_data\_pvc\_requests](#input\_twentycrm\_docker\_data\_pvc\_requests) | Storage capacity reservation for server persistent volume claim. | `string` | `"10Gi"` | no |
-| <a name="input_twentycrm_namespace"></a> [twentycrm\_namespace](#input\_twentycrm\_namespace) | Namespace for all TwentyCRM resources | `string` | `"twentycrm"` | no |
-| <a name="input_twentycrm_redis_image"></a> [twentycrm\_redis\_image](#input\_twentycrm\_redis\_image) | TwentyCRM image for Redis deployment. This defaults to latest. | `string` | `"redis/redis-stack-server:latest"` | no |
-| <a name="input_twentycrm_redis_replicas"></a> [twentycrm\_redis\_replicas](#input\_twentycrm\_redis\_replicas) | Number of replicas for the TwentyCRM Redis deployment. This defaults to 1. | `number` | `1` | no |
-| <a name="input_twentycrm_server_data_mount_path"></a> [twentycrm\_server\_data\_mount\_path](#input\_twentycrm\_server\_data\_mount\_path) | TwentyCRM mount path for servers application data. Defaults to '/app/packages/twenty-server/.local-storage'. | `string` | `"/app/packages/twenty-server/.local-storage"` | no |
-| <a name="input_twentycrm_server_image"></a> [twentycrm\_server\_image](#input\_twentycrm\_server\_image) | TwentyCRM server image for the server deployment. This defaults to latest. This value is also used for the workers image. | `string` | `"twentycrm/twenty:latest"` | no |
-| <a name="input_twentycrm_server_pv_capacity"></a> [twentycrm\_server\_pv\_capacity](#input\_twentycrm\_server\_pv\_capacity) | Storage capacity provisioned for server persistent volume. | `string` | `"10Gi"` | no |
-| <a name="input_twentycrm_server_pv_path"></a> [twentycrm\_server\_pv\_path](#input\_twentycrm\_server\_pv\_path) | Local path to use to store the physical volume if using local storage on nodes. | `string` | `""` | no |
-| <a name="input_twentycrm_server_pvc_requests"></a> [twentycrm\_server\_pvc\_requests](#input\_twentycrm\_server\_pvc\_requests) | Storage capacity reservation for server persistent volume claim. | `string` | `"10Gi"` | no |
-| <a name="input_twentycrm_server_replicas"></a> [twentycrm\_server\_replicas](#input\_twentycrm\_server\_replicas) | Number of replicas for the TwentyCRM server deployment. This defaults to 1. | `number` | `1` | no |
-| <a name="input_twentycrm_worker_replicas"></a> [twentycrm\_worker\_replicas](#input\_twentycrm\_worker\_replicas) | Number of replicas for the TwentyCRM worker deployment. This defaults to 1. | `number` | `1` | no |
-<!-- END_TF_DOCS -->

twenty/code/k8s/terraform/deployment-db.tf

@@ -1,87 +0,0 @@
-resource "kubernetes_deployment" "twentycrm_db" {
-  metadata {
-    name      = "${var.twentycrm_app_name}-db"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-    labels = {
-      app = "${var.twentycrm_app_name}-db"
-    }
-  }
-
-  spec {
-    replicas = var.twentycrm_db_replicas
-    selector {
-      match_labels = {
-        app = "${var.twentycrm_app_name}-db"
-      }
-    }
-
-    strategy {
-      type = "RollingUpdate"
-      rolling_update {
-        max_surge       = "1"
-        max_unavailable = "1"
-      }
-    }
-
-    template {
-      metadata {
-        labels = {
-          app = "${var.twentycrm_app_name}-db"
-        }
-      }
-
-      spec {
-        container {
-          image = var.twentycrm_db_image
-          name  = var.twentycrm_app_name
-          stdin = true
-          tty   = true
-          security_context {
-            allow_privilege_escalation = true
-          }
-
-          env {
-            name  = "POSTGRES_PASSWORD"
-            value = var.twentycrm_pgdb_admin_password
-          }
-          env {
-            name  = "BITNAMI_DEBUG"
-            value = true
-          }
-
-          port {
-            container_port = 5432
-            protocol       = "TCP"
-          }
-
-          resources {
-            requests = {
-              cpu    = "250m"
-              memory = "256Mi"
-            }
-            limits = {
-              cpu    = "1000m"
-              memory = "1024Mi"
-            }
-          }
-
-          volume_mount {
-            name       = "db-data"
-            mount_path = "/bitnami/postgresql"
-          }
-        }
-
-        volume {
-          name = "db-data"
-
-          persistent_volume_claim {
-            claim_name = kubernetes_persistent_volume_claim.db.metadata.0.name
-          }
-        }
-
-        dns_policy     = "ClusterFirst"
-        restart_policy = "Always"
-      }
-    }
-  }
-}

twenty/code/k8s/terraform/deployment-redis.tf

@@ -1,60 +0,0 @@
-resource "kubernetes_deployment" "twentycrm_redis" {
-  metadata {
-    name      = "${var.twentycrm_app_name}-redis"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-
-    labels = {
-      app = "${var.twentycrm_app_name}-redis"
-    }
-  }
-
-  spec {
-    replicas = var.twentycrm_redis_replicas
-    selector {
-      match_labels = {
-        app = "${var.twentycrm_app_name}-redis"
-      }
-    }
-
-    strategy {
-      type = "RollingUpdate"
-      rolling_update {
-        max_surge       = "1"
-        max_unavailable = "1"
-      }
-    }
-
-    template {
-      metadata {
-        labels = {
-          app = "${var.twentycrm_app_name}-redis"
-        }
-      }
-
-      spec {
-        container {
-          image = var.twentycrm_redis_image
-          name  = "redis"
-
-          port {
-            container_port = 6379
-            protocol       = "TCP"
-          }
-
-          resources {
-            requests = {
-              cpu    = "250m"
-              memory = "1024Mi"
-            }
-            limits = {
-              cpu    = "500m"
-              memory = "2048Mi"
-            }
-          }
-        }
-        dns_policy     = "ClusterFirst"
-        restart_policy = "Always"
-      }
-    }
-  }
-}

twenty/code/k8s/terraform/deployment-server.tf

@@ -1,146 +0,0 @@
-resource "kubernetes_deployment" "twentycrm_server" {
-  metadata {
-    name      = "${var.twentycrm_app_name}-server"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-    labels = {
-      app = "${var.twentycrm_app_name}-server"
-    }
-  }
-
-  spec {
-    replicas = var.twentycrm_server_replicas
-    selector {
-      match_labels = {
-        app = "${var.twentycrm_app_name}-server"
-      }
-    }
-
-    strategy {
-      type = "RollingUpdate"
-      rolling_update {
-        max_surge       = "1"
-        max_unavailable = "1"
-      }
-    }
-
-    template {
-      metadata {
-        labels = {
-          app = "${var.twentycrm_app_name}-server"
-        }
-      }
-
-      spec {
-        container {
-          image = var.twentycrm_server_image
-          name  = var.twentycrm_app_name
-          stdin = true
-          tty   = true
-
-          env {
-            name  = "PORT"
-            value = "3000"
-          }
-          # env {
-          #   name  = "DEBUG_MODE"
-          #   value = false
-          # }
-
-          env {
-            name  = "SERVER_URL"
-            value = var.twentycrm_app_hostname
-          }
-
-          env {
-            name  = "PG_DATABASE_URL"
-            value = "postgres://twenty:${var.twentycrm_pgdb_admin_password}@${kubernetes_service.twentycrm_db.metadata.0.name}.${kubernetes_namespace.twentycrm.metadata.0.name}.svc.cluster.local/default"
-          }
-          env {
-            name  = "REDIS_URL"
-            value = "redis://${kubernetes_service.twentycrm_redis.metadata.0.name}.${kubernetes_namespace.twentycrm.metadata.0.name}.svc.cluster.local:6379"
-          }
-          env {
-            name  = "DISABLE_DB_MIGRATIONS"
-            value = "false"
-          }
-
-          env {
-            name  = "STORAGE_TYPE"
-            value = "local"
-          }
-          env {
-            name  = "MESSAGE_QUEUE_TYPE"
-            value = "bull-mq"
-          }
-          env {
-            name  = "ACCESS_TOKEN_EXPIRES_IN"
-            value = "7d"
-          }
-          env {
-            name  = "LOGIN_TOKEN_EXPIRES_IN"
-            value = "1h"
-          }
-          env {
-            name = "APP_SECRET"
-            value_from {
-              secret_key_ref {
-                name = "tokens"
-                key  = "accessToken"
-              }
-            }
-          }
-
-          port {
-            container_port = 3000
-            protocol       = "TCP"
-          }
-
-          resources {
-            requests = {
-              cpu    = "250m"
-              memory = "256Mi"
-            }
-            limits = {
-              cpu    = "1000m"
-              memory = "1024Mi"
-            }
-          }
-
-          volume_mount {
-            name       = "server-data"
-            mount_path = var.twentycrm_server_data_mount_path
-          }
-
-          volume_mount {
-            name       = "docker-data"
-            mount_path = var.twentycrm_docker_data_mount_path
-          }
-        }
-
-        volume {
-          name = "server-data"
-
-          persistent_volume_claim {
-            claim_name = kubernetes_persistent_volume_claim.server.metadata.0.name
-          }
-        }
-
-        volume {
-          name = "docker-data"
-
-          persistent_volume_claim {
-            claim_name = kubernetes_persistent_volume_claim.docker_data.metadata.0.name
-          }
-        }
-
-        dns_policy     = "ClusterFirst"
-        restart_policy = "Always"
-      }
-    }
-  }
-  depends_on = [
-    kubernetes_deployment.twentycrm_db,
-    kubernetes_deployment.twentycrm_redis,
-    kubernetes_secret.twentycrm_tokens
-  ]
-}

twenty/code/k8s/terraform/deployment-worker.tf

@@ -1,108 +0,0 @@
-resource "kubernetes_deployment" "twentycrm_worker" {
-  metadata {
-    name      = "${var.twentycrm_app_name}-worker"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-    labels = {
-      app = "${var.twentycrm_app_name}-worker"
-    }
-  }
-
-  spec {
-    replicas = var.twentycrm_worker_replicas
-    selector {
-      match_labels = {
-        app = "${var.twentycrm_app_name}-worker"
-      }
-    }
-
-    strategy {
-      type = "RollingUpdate"
-      rolling_update {
-        max_surge       = "1"
-        max_unavailable = "1"
-      }
-    }
-
-    template {
-      metadata {
-        labels = {
-          app = "${var.twentycrm_app_name}-worker"
-        }
-      }
-
-      spec {
-        container {
-          image   = var.twentycrm_server_image
-          name    = var.twentycrm_app_name
-          stdin   = true
-          tty     = true
-          command = ["yarn", "worker:prod"]
-
-          env {
-            name  = "SERVER_URL"
-            value = var.twentycrm_app_hostname
-          }
-
-          env {
-            name  = "PG_DATABASE_URL"
-            value = "postgres://twenty:${var.twentycrm_pgdb_admin_password}@${kubernetes_service.twentycrm_db.metadata.0.name}.${kubernetes_namespace.twentycrm.metadata.0.name}.svc.cluster.local/default"
-          }
-
-          env {
-            name  = "CACHE_STORAGE_TYPE"
-            value = "redis"
-          }
-
-          env {
-            name  = "REDIS_URL"
-            value = "redis://${kubernetes_service.twentycrm_redis.metadata.0.name}.${kubernetes_namespace.twentycrm.metadata.0.name}.svc.cluster.local:6379"
-          }
-
-          env {
-            name  = "DISABLE_DB_MIGRATIONS"
-            value = "true" #it already runs on the server
-          }
-
-          env {
-            name  = "STORAGE_TYPE"
-            value = "local"
-          }
-          env {
-            name  = "MESSAGE_QUEUE_TYPE"
-            value = "bull-mq"
-          }
-
-          env {
-            name = "APP_SECRET"
-            value_from {
-              secret_key_ref {
-                name = "tokens"
-                key  = "accessToken"
-              }
-            }
-          }
-
-          resources {
-            requests = {
-              cpu    = "250m"
-              memory = "1024Mi"
-            }
-            limits = {
-              cpu    = "1000m"
-              memory = "2048Mi"
-            }
-          }
-        }
-
-        dns_policy     = "ClusterFirst"
-        restart_policy = "Always"
-      }
-    }
-  }
-  depends_on = [
-    kubernetes_deployment.twentycrm_db,
-    kubernetes_deployment.twentycrm_redis,
-    kubernetes_deployment.twentycrm_server,
-    kubernetes_secret.twentycrm_tokens,
-  ]
-}

twenty/code/k8s/terraform/ingress.tf

@@ -1,30 +0,0 @@
-resource "kubernetes_ingress" "twentycrm" {
-  wait_for_load_balancer = true
-  metadata {
-    name      = "${var.twentycrm_app_name}-ingress"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-    annotations = {
-      "kubernetes.io/ingress.class"                       = "nginx"
-      "nginx.ingress.kubernetes.io/configuration-snippet" = <<EOF
-      more_set_headers "X-Forwarded-For $http_x_forwarded_for";
-      EOF
-      "nginx.ingress.kubernetes.io/force-ssl-redirect"    = "false"
-      "nginx.ingress.kubernetes.io/backend-protocol"      = "HTTP"
-    }
-  }
-  spec {
-    ingress_class_name = "nginx"
-    rule {
-      host = var.twentycrm_app_hostname
-      http {
-        path {
-          path = "/*"
-          backend {
-            service_name = kubernetes_service.twentycrm_server.metadata.0.name
-            service_port = kubernetes_service.twentycrm_server.spec.0.port.0.port
-          }
-        }
-      }
-    }
-  }
-}

twenty/code/k8s/terraform/main.tf

@@ -1,23 +0,0 @@
-#############
-# Providers #
-#############
-provider "kubernetes" {
-  config_path = "~/.kube/config"
-}
-
-####################
-# Terraform Config #
-####################
-terraform {
-  required_version = ">= 1.9.2"
-  required_providers {
-    kubernetes = {
-      source  = "hashicorp/kubernetes"
-      version = ">= 2.32.0"
-    }
-    random = {
-      source  = "hashicorp/random"
-      version = ">= 3.6.3"
-    }
-  }
-}

twenty/code/k8s/terraform/namespace.tf

@@ -1,9 +0,0 @@
-resource "kubernetes_namespace" "twentycrm" {
-  metadata {
-    annotations = {
-      name = var.twentycrm_namespace
-    }
-
-    name = var.twentycrm_namespace
-  }
-}

twenty/code/k8s/terraform/pv-db.tf

@@ -1,19 +0,0 @@
-resource "kubernetes_persistent_volume" "db" {
-  metadata {
-    name = "${var.twentycrm_app_name}-db-pv"
-  }
-  spec {
-    storage_class_name = "default"
-    capacity = {
-      storage = var.twentycrm_db_pv_capacity
-    }
-    access_modes = ["ReadWriteOnce"]
-    # refer to Terraform Docs for your specific implementation requirements
-    # https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/persistent_volume
-    persistent_volume_source {
-      local {
-        path = var.twentycrm_db_pv_path
-      }
-    }
-  }
-}

twenty/code/k8s/terraform/pv-docker-data.tf

@@ -1,19 +0,0 @@
-resource "kubernetes_persistent_volume" "docker_data" {
-  metadata {
-    name = "${var.twentycrm_app_name}-docker-data-pv"
-  }
-  spec {
-    storage_class_name = "default"
-    capacity = {
-      storage = var.twentycrm_docker_data_pv_capacity
-    }
-    access_modes = ["ReadWriteOnce"]
-    # refer to Terraform Docs for your specific implementation requirements
-    # https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/persistent_volume
-    persistent_volume_source {
-      local {
-        path = var.twentycrm_docker_data_pv_path
-      }
-    }
-  }
-}

twenty/code/k8s/terraform/pv-server.tf

@@ -1,19 +0,0 @@
-resource "kubernetes_persistent_volume" "server" {
-  metadata {
-    name = "${var.twentycrm_app_name}-server-pv"
-  }
-  spec {
-    storage_class_name = "default"
-    capacity = {
-      storage = var.twentycrm_server_pv_capacity
-    }
-    access_modes = ["ReadWriteOnce"]
-    # refer to Terraform Docs for your specific implementation requirements
-    # https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/persistent_volume
-    persistent_volume_source {
-      local {
-        path = var.twentycrm_server_pv_path
-      }
-    }
-  }
-}

twenty/code/k8s/terraform/pvc-db.tf

@@ -1,15 +0,0 @@
-resource "kubernetes_persistent_volume_claim" "db" {
-  metadata {
-    name      = "${var.twentycrm_app_name}-db-pvc"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-  }
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = var.twentycrm_db_pvc_requests
-      }
-    }
-    volume_name = kubernetes_persistent_volume.db.metadata.0.name
-  }
-}

twenty/code/k8s/terraform/pvc-docker-data.tf

@@ -1,15 +0,0 @@
-resource "kubernetes_persistent_volume_claim" "docker_data" {
-  metadata {
-    name      = "${var.twentycrm_app_name}-docker-data-pvc"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-  }
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = var.twentycrm_docker_data_pvc_requests
-      }
-    }
-    volume_name = kubernetes_persistent_volume.docker_data.metadata.0.name
-  }
-}

twenty/code/k8s/terraform/pvc-server.tf

@@ -1,15 +0,0 @@
-resource "kubernetes_persistent_volume_claim" "server" {
-  metadata {
-    name      = "${var.twentycrm_app_name}-server-pvc"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-  }
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = var.twentycrm_server_pvc_requests
-      }
-    }
-    volume_name = kubernetes_persistent_volume.server.metadata.0.name
-  }
-}

twenty/code/k8s/terraform/secret.tf

@@ -1,28 +0,0 @@
-locals {
-  tokens = [
-    "accessToken",
-    "loginToken",
-    "refreshToken",
-    "fileToken"
-  ]
-}
-
-resource "random_bytes" "this" {
-  for_each = toset(local.tokens)
-
-  length = 32
-}
-
-resource "kubernetes_secret" "twentycrm_tokens" {
-  metadata {
-    name      = "tokens"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-  }
-
-  data = {
-    accessToken  = random_bytes.this["accessToken"].base64
-    loginToken   = random_bytes.this["loginToken"].base64
-    refreshToken = random_bytes.this["refreshToken"].base64
-    fileToken    = random_bytes.this["fileToken"].base64
-  }
-}

twenty/code/k8s/terraform/service-db.tf

@@ -1,18 +0,0 @@
-resource "kubernetes_service" "twentycrm_db" {
-  metadata {
-    name      = "${var.twentycrm_app_name}-db"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-  }
-  spec {
-    selector = {
-      app = "${var.twentycrm_app_name}-db"
-    }
-    session_affinity = "ClientIP"
-    port {
-      port        = 5432
-      target_port = 5432
-    }
-
-    type = "ClusterIP"
-  }
-}

twenty/code/k8s/terraform/service-redis.tf

@@ -1,18 +0,0 @@
-resource "kubernetes_service" "twentycrm_redis" {
-  metadata {
-    name      = "${var.twentycrm_app_name}-redis"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-  }
-  spec {
-    selector = {
-      app = "${var.twentycrm_app_name}-redis"
-    }
-    session_affinity = "ClientIP"
-    port {
-      port        = 6379
-      target_port = 6379
-    }
-
-    type = "ClusterIP"
-  }
-}

twenty/code/k8s/terraform/service-server.tf

@@ -1,19 +0,0 @@
-resource "kubernetes_service" "twentycrm_server" {
-  metadata {
-    name      = "${var.twentycrm_app_name}-server"
-    namespace = kubernetes_namespace.twentycrm.metadata.0.name
-  }
-  spec {
-    selector = {
-      app = "${var.twentycrm_app_name}-server"
-    }
-    session_affinity = "ClientIP"
-    port {
-      name        = "http-tcp"
-      port        = 3000
-      target_port = 3000
-    }
-
-    type = "ClusterIP"
-  }
-}

twenty/code/k8s/terraform/variables.tf

@@ -1,136 +0,0 @@
-######################
-# Required Variables #
-######################
-variable "twentycrm_pgdb_admin_password" {
-  type        = string
-  description = "TwentyCRM password for postgres database."
-  sensitive   = true
-}
-
-variable "twentycrm_app_hostname" {
-  type        = string
-  description = "The protocol, DNS fully qualified hostname, and port used to access TwentyCRM in your environment. Ex: https://crm.example.com:443"
-}
-
-######################
-# Optional Variables #
-######################
-variable "twentycrm_app_name" {
-  type        = string
-  default     = "twentycrm"
-  description = "A friendly name prefix to use for every component deployed."
-}
-
-variable "twentycrm_server_image" {
-  type        = string
-  default     = "twentycrm/twenty:latest"
-  description = "TwentyCRM server image for the server deployment. This defaults to latest. This value is also used for the workers image."
-}
-
-variable "twentycrm_db_image" {
-  type        = string
-  default     = "twentycrm/twenty-postgres-spilo:latest"
-  description = "TwentyCRM image for database deployment. This defaults to latest."
-}
-
-variable "twentycrm_server_replicas" {
-  type        = number
-  default     = 1
-  description = "Number of replicas for the TwentyCRM server deployment. This defaults to 1."
-}
-
-variable "twentycrm_worker_replicas" {
-  type        = number
-  default     = 1
-  description = "Number of replicas for the TwentyCRM worker deployment. This defaults to 1."
-}
-
-variable "twentycrm_db_replicas" {
-  type        = number
-  default     = 1
-  description = "Number of replicas for the TwentyCRM database deployment. This defaults to 1."
-}
-
-variable "twentycrm_server_data_mount_path" {
-  type        = string
-  default     = "/app/packages/twenty-server/.local-storage"
-  description = "TwentyCRM mount path for servers application data. Defaults to '/app/packages/twenty-server/.local-storage'."
-}
-
-variable "twentycrm_db_pv_path" {
-  type        = string
-  default     = ""
-  description = "Local path to use to store the physical volume if using local storage on nodes."
-}
-
-variable "twentycrm_server_pv_path" {
-  type        = string
-  default     = ""
-  description = "Local path to use to store the physical volume if using local storage on nodes."
-}
-
-variable "twentycrm_db_pv_capacity" {
-  type        = string
-  default     = "10Gi"
-  description = "Storage capacity provisioned for database persistent volume."
-}
-
-variable "twentycrm_db_pvc_requests" {
-  type        = string
-  default     = "10Gi"
-  description = "Storage capacity reservation for database persistent volume claim."
-}
-
-variable "twentycrm_server_pv_capacity" {
-  type        = string
-  default     = "10Gi"
-  description = "Storage capacity provisioned for server persistent volume."
-}
-
-variable "twentycrm_server_pvc_requests" {
-  type        = string
-  default     = "10Gi"
-  description = "Storage capacity reservation for server persistent volume claim."
-}
-
-variable "twentycrm_namespace" {
-  type        = string
-  default     = "twentycrm"
-  description = "Namespace for all TwentyCRM resources"
-}
-
-variable "twentycrm_redis_replicas" {
-  type        = number
-  default     = 1
-  description = "Number of replicas for the TwentyCRM Redis deployment. This defaults to 1."
-}
-
-variable "twentycrm_redis_image" {
-  type        = string
-  default     = "redis/redis-stack-server:latest"
-  description = "TwentyCRM image for Redis deployment. This defaults to latest."
-}
-
-variable "twentycrm_docker_data_mount_path" {
-  type        = string
-  default     = "/app/docker-data"
-  description = "TwentyCRM mount path for servers application data. Defaults to '/app/docker-data'."
-}
-
-variable "twentycrm_docker_data_pv_path" {
-  type        = string
-  default     = ""
-  description = "Local path to use to store the physical volume if using local storage on nodes."
-}
-
-variable "twentycrm_docker_data_pv_capacity" {
-  type        = string
-  default     = "100Mi"
-  description = "Storage capacity provisioned for server persistent volume."
-}
-
-variable "twentycrm_docker_data_pvc_requests" {
-  type        = string
-  default     = "100Mi"
-  description = "Storage capacity reservation for server persistent volume claim."
-}

twenty/code/scripts/1-click.sh

@@ -1,22 +0,0 @@
-pull_version=${VERSION:-$(curl -s https://api.github.com/repos/twentyhq/twenty/tags | grep '"name":' | head -n 1 | cut -d '"' -f 4)}
-
-if [[ -z "$pull_version" ]]; then
-  echo "Error: Unable to fetch the latest version tag. Please check your network connection or the GitHub API response."
-  exit 1
-fi
-pull_branch=${BRANCH:-$pull_version}
-
-version_num=${pull_version#v}
-target_version="0.32.4"
-
-# We moved the install script to a different location in v0.32.4
-if [[ -n "$BRANCH" ]] || [[ "$(printf '%s\n' "$target_version" "$version_num" | sort -V | head -n1)" != "$version_num" ]]; then
-  curl -sL "https://raw.githubusercontent.com/twentyhq/twenty/$pull_branch/packages/twenty-docker/scripts/install.sh" -o twenty_install.sh
-else
-  curl -sL "https://raw.githubusercontent.com/twentyhq/twenty/$pull_branch/install.sh" -o twenty_install.sh
-fi
-
-chmod +x twenty_install.sh
-VERSION="$VERSION" BRANCH="$BRANCH" ./twenty_install.sh
-
-rm twenty_install.sh

twenty/code/scripts/install.sh

@@ -1,167 +0,0 @@
-#!/bin/bash
-
-echo "🔧 Checking dependencies..."
-if ! command -v docker &>/dev/null; then
-  echo -e "\t❌ Docker is not installed or not in PATH. Please install Docker first.\n\t\tSee https://docs.docker.com/get-docker/"
-  exit 1
-fi
-# Check if docker compose plugin is installed
-if ! docker compose version &>/dev/null; then
-  echo -e "\t❌ Docker Compose is not installed or not in PATH (n.b. docker-compose is deprecated)\n\t\tUpdate docker or install docker-compose-plugin\n\t\tOn Linux: sudo apt-get install docker-compose-plugin\n\t\tSee https://docs.docker.com/compose/install/"
-  exit 1
-fi
-# Check if docker is started
-if ! docker info &>/dev/null; then
-  echo -e "\t❌ Docker is not running.\n\t\tPlease start Docker Desktop, Docker or check documentation at https://docs.docker.com/config/daemon/start/"
-  exit 1
-fi
-if ! command -v curl &>/dev/null; then
-  echo -e "\t❌ Curl is not installed or not in PATH.\n\t\tOn macOS: brew install curl\n\t\tOn Linux: sudo apt install curl"
-  exit 1
-fi
-
-# Check if docker compose version is >= 2
-if [ "$(docker compose version --short | cut -d' ' -f3 | cut -d'.' -f1)" -lt 2 ]; then
-  echo -e "\t❌ Docker Compose is outdated. Please update Docker Compose to version 2 or higher.\n\t\tSee https://docs.docker.com/compose/install/linux/"
-  exit 1
-fi
-# Check if docker-compose is installed, if so issue a warning if version is < 2
-if command -v docker-compose &>/dev/null; then
-  if [ "$(docker-compose version --short | cut -d' ' -f3 | cut -d'.' -f1)" -lt 2 ]; then
-    echo -e "\n\t⚠️ 'docker-compose' is installed but outdated. Make sure to use 'docker compose' or to upgrade 'docker-compose' to version 2.\n\t\tSee https://docs.docker.com/compose/install/standalone/\n"
-  fi
-fi
-
-# Catch errors
-set -e
-function on_exit {
-  # $? is the exit status of the last command executed
-  local exit_status=$?
-  if [ $exit_status -ne 0 ]; then
-    echo "❌ Something went wrong, exiting: $exit_status"
-  fi
-}
-trap on_exit EXIT
-
-# Use environment variables VERSION and BRANCH, with defaults if not set
-version=${VERSION:-$(curl -s "https://hub.docker.com/v2/repositories/twentycrm/twenty/tags" | grep -o '"name":"[^"]*"' | grep -v 'latest' | cut -d'"' -f4 | sort -V | tail -n1)}
-branch=${BRANCH:-$(curl -s https://api.github.com/repos/twentyhq/twenty/tags | grep '"name":' | head -n 1 | cut -d '"' -f 4)}
-
-echo "🚀 Using docker version $version and Github branch $branch"
-
-dir_name="twenty"
-function ask_directory {
-  read -p "📁 Enter the directory name to setup the project (default: $dir_name): " answer
-  if [ -n "$answer" ]; then
-    dir_name=$answer
-  fi
-}
-
-ask_directory
-
-while [ -d "$dir_name" ]; do
-  read -p "🚫 Directory '$dir_name' already exists. Do you want to overwrite it? (y/N) " answer
-  if [ "$answer" = "y" ]; then
-    break
-  else
-    ask_directory
-  fi
-done
-
-# Create a directory named twenty
-echo "📁 Creating directory '$dir_name'"
-mkdir -p "$dir_name" && cd "$dir_name" || { echo "❌ Failed to create/access directory '$dir_name'"; exit 1; }
-
-# Copy twenty/packages/twenty-docker/docker-compose.yml in it
-echo -e "\t• Copying docker-compose.yml"
-curl -sLo docker-compose.yml https://raw.githubusercontent.com/twentyhq/twenty/$branch/packages/twenty-docker/docker-compose.yml
-
-# Copy twenty/packages/twenty-docker/.env.example to .env
-echo -e "\t• Setting up .env file"
-curl -sLo .env https://raw.githubusercontent.com/twentyhq/twenty/$branch/packages/twenty-docker/.env.example
-
-# Replace TAG=latest by TAG=<latest_release or version input>
-if [[ $(uname) == "Darwin" ]]; then
-  # Running on macOS
-  sed -i '' "s/TAG=latest/TAG=$version/g" .env
-else
-  # Assuming Linux
-  sed -i'' "s/TAG=latest/TAG=$version/g" .env
-fi
-
-# Generate random strings for secrets
-echo "# === Randomly generated secret ===" >> .env
-echo "APP_SECRET=$(openssl rand -base64 32)" >> .env
-
-echo "" >> .env
-echo "PG_DATABASE_PASSWORD=$(openssl rand -hex 16)" >> .env
-
-echo -e "\t• .env configuration completed"
-
-port=3000
-# Check if command nc is available
-if command -v nc &> /dev/null; then
-  # Check if port 3000 is already in use, propose to change it
-  while nc -zv localhost $port &>/dev/null; do
-    read -p "🚫 Port $port is already in use. Do you want to use another port? (Y/n) " answer
-    if [ "$answer" = "n" ]; then
-      continue
-    fi
-    read -p "Enter a new port number: " new_port
-    if [[ $(uname) == "Darwin" ]]; then
-      sed -i '' "s/$port:$port/$new_port:$port/g" docker-compose.yml
-      sed -E -i '' "s|^SERVER_URL=http://localhost:[0-9]+|SERVER_URL=http://localhost:$new_port|g" .env
-    else
-      sed -i'' "s/$port:$port/$new_port:$port/g" docker-compose.yml
-      sed -E -i'' "s|^SERVER_URL=http://localhost:[0-9]+|SERVER_URL=http://localhost:$new_port|g" .env
-    fi
-    port=$new_port
-  done
-fi
-
-# Ask user if they want to start the project
-read -p "🚀 Do you want to start the project now? (Y/n) " answer
-if [ "$answer" = "n" ]; then
-  echo "✅ Project setup completed. Run 'docker compose up -d' to start."
-  exit 0
-else
-  echo "🐳 Starting Docker containers..."
-  docker compose up -d
-  # Check if port is listening
-  echo "Waiting for server to be healthy, it might take a few minutes while we initialize the database..."
-  # Tail logs of the server until it's ready
-  docker compose logs -f server &
-  pid=$!
-  while [ ! $(docker inspect --format='{{.State.Health.Status}}' twenty-server-1) = "healthy" ]; do
-    sleep 1
-  done
-  kill $pid
-  echo ""
-  echo "✅ Server is up and running"
-fi
-
-function ask_open_browser {
-  read -p "🌐 Do you want to open the project in your browser? (Y/n) " answer
-  if [ "$answer" = "n" ]; then
-    echo "✅ Setup completed. Access your project at http://localhost:$port"
-    exit 0
-  fi
-}
-
-# Ask user if they want to open the project
-# Running on macOS
-if [[ $(uname) == "Darwin" ]]; then
-  ask_open_browser
-
-  open "http://localhost:$port"
-# Assuming Linux
-else
-  # xdg-open is not installed, we could be running in a non gui environment
-  if command -v xdg-open >/dev/null 2>&1; then
-    ask_open_browser
-
-    xdg-open "http://localhost:$port"
-  else
-    echo "✅ Setup completed. Your project is available at http://localhost:$port"
-  fi
-fi

twenty/code/twenty-postgres-spilo/Dockerfile

@@ -1,68 +0,0 @@
-ARG POSTGRES_VERSION=15
-ARG SPILO_VERSION=3.2-p1
-ARG WRAPPERS_VERSION=0.2.0
-
-# Build the mysql_fdw extension
-FROM debian:bookworm AS build-mysql_fdw
-ARG POSTGRES_VERSION
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt update && \
-    apt install -y \
-    build-essential \
-    git \
-    postgresql-server-dev-${POSTGRES_VERSION} \
-    default-libmysqlclient-dev && \
-    rm -rf /var/lib/apt/lists/*
-
-# Install mysql_fdw
-RUN git clone https://github.com/EnterpriseDB/mysql_fdw.git
-WORKDIR /mysql_fdw
-RUN make USE_PGXS=1
-
-
-# Build libssl for wrappers
-FROM ubuntu:22.04 AS build-libssl
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt update && \
-    apt install -y \
-    build-essential \
-    git && \
-    rm -rf /var/lib/apt/lists/*
-
-WORKDIR /build
-RUN git clone --branch OpenSSL_1_1_1-stable https://github.com/openssl/openssl.git
-WORKDIR /build/openssl
-RUN ./config && make && make install
-
-
-# Extend the Spilo image with the mysql_fdw extensions
-FROM ghcr.io/zalando/spilo-${POSTGRES_VERSION}:${SPILO_VERSION}
-ARG POSTGRES_VERSION
-ARG WRAPPERS_VERSION
-ARG TARGETARCH
-
-# Install precompiled supabase wrappers extensions
-RUN set -eux; \
-    ARCH="$(dpkg --print-architecture)"; \
-    case "${ARCH}" in \
-    aarch64|arm64) TARGETARCH='arm64';; \
-    amd64|x86_64) TARGETARCH='amd64';; \
-    *) echo "Unsupported arch: ${ARCH}"; exit 1;; \
-    esac;
-
-RUN apt update && apt install default-libmysqlclient-dev -y && rm -rf /var/lib/apt/lists/*
-
-RUN curl -L "https://github.com/supabase/wrappers/releases/download/v${WRAPPERS_VERSION}/wrappers-v${WRAPPERS_VERSION}-pg${POSTGRES_VERSION}-${TARGETARCH}-linux-gnu.deb" -o wrappers.deb && \
-    dpkg --install wrappers.deb && \
-    rm wrappers.deb
-
-COPY --from=build-libssl /usr/local/lib/libssl* /usr/local/lib/libcrypto*  /usr/lib/
-COPY --from=build-libssl /usr/local/lib/engines-1.1 /usr/lib/engines-1.1
-
-# Copy mysql_fdw
-COPY --from=build-mysql_fdw /mysql_fdw/mysql_fdw.so \
-    /usr/lib/postgresql/${POSTGRES_VERSION}/lib/mysql_fdw.so
-COPY --from=build-mysql_fdw /mysql_fdw/mysql_fdw*.sql /mysql_fdw/mysql_fdw.control /mysql_fdw/mysql_fdw_pushdown.config \
-    /usr/share/postgresql/${POSTGRES_VERSION}/extension/

twenty/code/twenty-website/Dockerfile

@@ -1,29 +0,0 @@
-FROM node:18.17.1-alpine as twenty-website-build
-
-
-WORKDIR /app
-
-COPY ./package.json .
-COPY ./yarn.lock .
-COPY ./.yarnrc.yml .
-COPY ./.yarn/releases /app/.yarn/releases
-COPY ./tools/eslint-rules /app/tools/eslint-rules
-COPY ./packages/twenty-website/package.json /app/packages/twenty-website/package.json
-
-RUN yarn
-
-COPY ./packages/twenty-website /app/packages/twenty-website
-RUN npx nx build twenty-website
-
-FROM node:18.17.1-alpine as twenty-website
-
-WORKDIR /app/packages/twenty-website
-
-COPY --from=twenty-website-build /app /app
-
-WORKDIR /app/packages/twenty-website
-
-LABEL org.opencontainers.image.source=https://github.com/twentyhq/twenty
-LABEL org.opencontainers.image.description="This image provides a consistent and reproducible environment for the website."
-
-CMD ["/bin/sh", "-c", "npx nx start"]

twenty/code/twenty/Dockerfile

@@ -1,85 +0,0 @@
-# Base image for common dependencies
-FROM node:18.17.1-alpine as common-deps
-
-WORKDIR /app
-
-# Copy only the necessary files for dependency resolution
-COPY ./package.json ./yarn.lock ./.yarnrc.yml ./tsconfig.base.json ./nx.json /app/
-COPY ./.yarn/releases /app/.yarn/releases
-
-COPY ./packages/twenty-emails/package.json /app/packages/twenty-emails/
-COPY ./packages/twenty-server/package.json /app/packages/twenty-server/
-COPY ./packages/twenty-server/patches /app/packages/twenty-server/patches
-COPY ./packages/twenty-ui/package.json /app/packages/twenty-ui/
-COPY ./packages/twenty-shared/package.json /app/packages/twenty-shared/
-COPY ./packages/twenty-front/package.json /app/packages/twenty-front/
-
-# Install all dependencies
-RUN yarn && yarn cache clean && npx nx reset
-
-
-# Build the back
-FROM common-deps as twenty-server-build
-
-# Copy sourcecode after installing dependences to accelerate subsequents builds
-COPY ./packages/twenty-emails /app/packages/twenty-emails
-COPY ./packages/twenty-shared /app/packages/twenty-shared
-COPY ./packages/twenty-server /app/packages/twenty-server
-
-RUN npx nx run twenty-server:build
-RUN mv /app/packages/twenty-server/dist /app/packages/twenty-server/build
-RUN npx nx run twenty-server:build:packageJson
-RUN mv /app/packages/twenty-server/dist/package.json /app/packages/twenty-server/package.json
-RUN rm -rf /app/packages/twenty-server/dist
-RUN mv /app/packages/twenty-server/build /app/packages/twenty-server/dist
-
-RUN yarn workspaces focus --production twenty-emails twenty-shared twenty-server
-
-
-# Build the front
-FROM common-deps as twenty-front-build
-
-ARG REACT_APP_SERVER_BASE_URL
-
-COPY ./packages/twenty-front /app/packages/twenty-front
-COPY ./packages/twenty-ui /app/packages/twenty-ui
-COPY ./packages/twenty-shared /app/packages/twenty-shared
-RUN npx nx build twenty-front
-
-
-# Final stage: Run the application
-FROM node:18.17.1-alpine as twenty
-
-# Used to run healthcheck in docker
-RUN apk add --no-cache curl jq
-
-RUN npm install -g tsx
-
-RUN apk add --no-cache postgresql-client
-
-COPY ./packages/twenty-docker/twenty/entrypoint.sh /app/entrypoint.sh
-RUN chmod +x /app/entrypoint.sh
-WORKDIR /app/packages/twenty-server
-
-ARG REACT_APP_SERVER_BASE_URL
-ENV REACT_APP_SERVER_BASE_URL $REACT_APP_SERVER_BASE_URL
-ARG SENTRY_RELEASE
-ENV SENTRY_RELEASE $SENTRY_RELEASE
-
-# Copy built applications from previous stages
-COPY --chown=1000 --from=twenty-server-build /app /app
-COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-server /app/packages/twenty-server
-COPY --chown=1000 --from=twenty-front-build /app/packages/twenty-front/build /app/packages/twenty-server/dist/front
-
-# Set metadata and labels
-LABEL org.opencontainers.image.source=https://github.com/twentyhq/twenty
-LABEL org.opencontainers.image.description="This image provides a consistent and reproducible environment for the backend and frontend, ensuring it deploys faster and runs the same way regardless of the deployment environment."
-
-RUN mkdir /app/.local-storage
-RUN chown -R 1000 /app
-
-# Use non root user with uid 1000
-USER 1000
-
-CMD ["node", "dist/src/main"]
-ENTRYPOINT ["/app/entrypoint.sh"]

twenty/code/twenty/entrypoint.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-set -e
-
-# Check if the initialization has already been done and that we enabled automatic migration
-if [ "${DISABLE_DB_MIGRATIONS}" != "true" ] && [ ! -f /app/docker-data/db_status ]; then
-    echo "Running database setup and migrations..."
-
-    # Creating the database if it doesn't exist
-    PGUSER=$(echo $PG_DATABASE_URL | awk -F '//' '{print $2}' | awk -F ':' '{print $1}')
-    PGPASS=$(echo $PG_DATABASE_URL | awk -F ':' '{print $3}' | awk -F '@' '{print $1}')
-    PGHOST=$(echo $PG_DATABASE_URL | awk -F '@' '{print $2}' | awk -F ':' '{print $1}')
-    PGPORT=$(echo $PG_DATABASE_URL | awk -F ':' '{print $4}' | awk -F '/' '{print $1}')
-    PGPASSWORD=${PGPASS} psql -h ${PGHOST} -p ${PGPORT} -U ${PGUSER} -d postgres -tc "SELECT 1 FROM pg_database WHERE datname = 'default'" | grep -q 1 || \
-    PGPASSWORD=${PGPASS} psql -h ${PGHOST} -p ${PGPORT} -U ${PGUSER} -d postgres -c "CREATE DATABASE \"default\""
-
-    # Run setup and migration scripts
-    NODE_OPTIONS="--max-old-space-size=1500" tsx ./scripts/setup-db.ts
-    yarn database:migrate:prod
-
-    # Mark initialization as done
-    echo "Successfuly migrated DB!"
-    touch /app/docker-data/db_status
-fi
-
-# Continue with the original Docker command
-exec "$@"

twenty/update.js

@@ -1,7 +0,0 @@
-import utils from "../utils.js";
-
-await utils.cloneOrPullRepo({ repo: "git@github.com:twentyhq/twenty.git" });
-await utils.copyDir("./repo/packages/twenty-docker", "./code");
-
-await utils.removeContainerNames("./code/docker-compose.yml");
-await utils.removePorts("./code/docker-compose.yml");

twenty/update.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [ ! -d "./repo" ]; then
-    git clone --depth 1 --branch main --single-branch git@github.com:twentyhq/twenty.git repo
-else
-    cd repo
-    git pull
-    cd ..
-fi
-
-cp -r ./repo/packages/twenty-docker/. ./code
-
-