Merge branch 'next' into next

2024-09-01 11:31:27 -05:00
parent b4175658e9 c6df243623
commit 7645047d75
151 changed files with 6833 additions and 2949 deletions
--- a/templates/compose/activepieces.yaml
+++ b/templates/compose/activepieces.yaml
@@ -2,11 +2,13 @@
 # slogan: Open source no-code business automation.
 # tags: workflow, automation, no code, open source
 # logo: svgs/activepieces.png
+# port: 80

 services:
  activepieces:
    image: "ghcr.io/activepieces/activepieces:latest"
    environment:
+      - SERVICE_FQDN_ACTIVEPIECES
      - AP_API_KEY=$SERVICE_PASSWORD_64_APIKEY
      - AP_ENCRYPTION_KEY=$SERVICE_PASSWORD_ENCRYPTIONKEY
      - AP_ENGINE_EXECUTABLE_PATH=dist/packages/engine/main.js
--- a/templates/compose/appwrite.env
+++ b/templates/compose/appwrite.env
@@ -3,9 +3,6 @@ _APP_LOCALE=en
 _APP_OPTIONS_ABUSE=enabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=
-_APP_DOMAIN=
-_APP_DOMAIN_TARGET=
-_APP_DOMAIN_FUNCTIONS=
 _APP_CONSOLE_WHITELIST_ROOT=enabled
 _APP_CONSOLE_WHITELIST_EMAILS=
 _APP_CONSOLE_WHITELIST_IPS=
@@ -28,9 +25,6 @@ _APP_REDIS_PASS=
 _APP_DB_HOST=appwrite-mariadb
 _APP_DB_PORT=3306
 _APP_DB_SCHEMA=appwrite
-_APP_DB_USER=$SERVICE_USER_MYSQL
-_APP_DB_PASS=$SERVICE_PASSWORD_MYSQL
-_APP_DB_ROOT_PASS=$SERVICE_PASSWORD_ROOTMYSQL
 _APP_SMTP_HOST=
 _APP_SMTP_PORT=
 _APP_SMTP_SECURE=
@@ -72,7 +66,6 @@ _APP_FUNCTIONS_CPUS=0
 _APP_FUNCTIONS_MEMORY=0
 _APP_FUNCTIONS_MEMORY_SWAP=0
 _APP_FUNCTIONS_RUNTIMES=node-20.0,php-8.2,python-3.11,ruby-3.2
-_APP_EXECUTOR_SECRET=$SERVICE_PASSWORD_64_APPWRITE
 _APP_EXECUTOR_HOST=http://appwrite-executor/v1
 _APP_EXECUTOR_RUNTIME_NETWORK=appwrite_runtimes
 _APP_FUNCTIONS_INACTIVE_THRESHOLD=60
--- a/templates/compose/appwrite.yaml
+++ b/templates/compose/appwrite.yaml
@@ -52,8 +52,9 @@ services:
      - _APP_DB_HOST
      - _APP_DB_PORT
      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
+      - _APP_DB_USER=$SERVICE_USER_MARIADB
+      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
+      - _APP_DB_ROOT_PASS=$SERVICE_PASSWORD_MARIADBROOT
      - _APP_SMTP_HOST
      - _APP_SMTP_PORT
      - _APP_SMTP_SECURE
@@ -92,7 +93,7 @@ services:
      - _APP_FUNCTIONS_CPUS
      - _APP_FUNCTIONS_MEMORY
      - _APP_FUNCTIONS_RUNTIMES
-      - _APP_EXECUTOR_SECRET
+      - _APP_EXECUTOR_SECRET=$SERVICE_PASSWORD_64_APPWRITE
      - _APP_EXECUTOR_HOST
      - _APP_LOGGING_PROVIDER
      - _APP_LOGGING_CONFIG
@@ -500,7 +501,7 @@ services:
      - _APP_MAINTENANCE_RETENTION_SCHEDULES

  appwrite-worker-usage:
-    image: appwrite/appwrite:1.5.1
+    image: appwrite/appwrite:1.5
    entrypoint: worker-usage
    container_name: appwrite-worker-usage
    <<: *x-logging
@@ -527,7 +528,7 @@ services:
      - _APP_USAGE_AGGREGATION_INTERVAL

  appwrite-worker-usage-dump:
-    image: appwrite/appwrite:1.5.1
+    image: appwrite/appwrite:1.5
    entrypoint: worker-usage-dump
    <<: *x-logging
    container_name: appwrite-worker-usage-dump
--- a/templates/compose/budibase.yaml
+++ b/templates/compose/budibase.yaml
@@ -0,0 +1,150 @@
+# documentation: https://docs.budibase.com/docs/docker-compose
+# slogan: Low code platform for building business apps and workflows in minutes. Supports PostgreSQL, MySQL, MSSQL, MongoDB, Rest API, Docker, K8s, and more.
+# tags: budibase,low-code,business-apps,workflow,automation,postgresql,mysql,mssql,mongodb,docker,kubernetes
+# logo: svgs/budibase.svg
+# port: 10000
+
+services:
+  app-service:
+    image: budibase.docker.scarf.sh/budibase/apps
+    environment:
+      - SELF_HOSTED=1
+      - COUCH_DB_URL=http://$SERVICE_USER_BUDIBASE_COUCHDB:$SERVICE_PASSWORD_BUDIBASE_COUCHDB@couchdb-service:5984
+      - WORKER_URL=http://worker-service:4003
+      - MINIO_URL=http://minio-service:9000
+      - MINIO_ACCESS_KEY=$SERVICE_USER_BUDIBASE_MINIO
+      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_BUDIBASE_MINIO
+      - INTERNAL_API_KEY=$SERVICE_BASE64_128_BUDIBASE
+      - BUDIBASE_ENVIRONMENT=${BUDIBASE_ENVIRONMENT:-PRODUCTION}
+      - PORT=4002
+      - API_ENCRYPTION_KEY=$SERVICE_BASE64_64_BUDIBASE
+      - JWT_SECRET=$SERVICE_BASE64_64_BUDIBASE
+      - LOG_LEVEL=info
+      - ENABLE_ANALYTICS=${ENABLE_ANALYTICS:-true}
+      - REDIS_URL=redis-service:6379
+      - REDIS_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_REDIS
+      - BB_ADMIN_USER_EMAIL=
+      - BB_ADMIN_USER_PASSWORD=
+    depends_on:
+      - worker-service
+      - redis-service
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://app-service:4002"]
+      interval: 15s
+      timeout: 15s
+      retries: 5
+      start_period: 10s
+
+  worker-service:
+    image: budibase.docker.scarf.sh/budibase/worker
+    environment:
+      - SELF_HOSTED=1
+      - PORT=4003
+      - CLUSTER_PORT=10000
+      - API_ENCRYPTION_KEY=$SERVICE_BASE64_64_BUDIBASE
+      - JWT_SECRET=$SERVICE_BASE64_64_BUDIBASE
+      - MINIO_ACCESS_KEY=$SERVICE_USER_BUDIBASE_MINIO
+      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_BUDIBASE_MINIO
+      - MINIO_URL=http://minio-service:9000
+      - APPS_URL=http://app-service:4002
+      - COUCH_DB_USERNAME=$SERVICE_USER_BUDIBASE_COUCHDB
+      - COUCH_DB_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_COUCHDB
+      - COUCH_DB_URL=http://$SERVICE_USER_BUDIBASE_COUCHDB:$SERVICE_PASSWORD_BUDIBASE_COUCHDB@couchdb-service:5984
+      - INTERNAL_API_KEY=$SERVICE_BASE64_128_BUDIBASE
+      - REDIS_URL=redis-service:6379
+      - REDIS_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_REDIS
+    depends_on:
+      - redis-service
+      - minio-service
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://worker-service:4003"]
+      interval: 15s
+      timeout: 15s
+      retries: 5
+      start_period: 10s
+
+  minio-service:
+    image: minio/minio
+    volumes:
+      - minio_data:/data
+    environment:
+      - MINIO_ACCESS_KEY=$SERVICE_USER_BUDIBASE_MINIO
+      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_BUDIBASE_MINIO
+      - MINIO_BROWSER=off
+    command: server /data --console-address ":9001"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 30s
+      timeout: 20s
+      retries: 3
+
+  proxy-service:
+    image: budibase/proxy
+    environment:
+      - SERVICE_FQDN_BUDIBASE_10000
+      - PROXY_RATE_LIMIT_WEBHOOKS_PER_SECOND=10
+      - PROXY_RATE_LIMIT_API_PER_SECOND=20
+      - APPS_UPSTREAM_URL=http://app-service:4002
+      - WORKER_UPSTREAM_URL=http://worker-service:4003
+      - MINIO_UPSTREAM_URL=http://minio-service:9000
+      - COUCHDB_UPSTREAM_URL=http://couchdb-service:5984
+      - WATCHTOWER_UPSTREAM_URL=http://watchtower-service:8080
+      - RESOLVER=127.0.0.11
+    depends_on:
+      - minio-service
+      - worker-service
+      - app-service
+      - couchdb-service
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:10000/"]
+      interval: 15s
+      timeout: 15s
+      retries: 5
+      start_period: 10s
+
+  couchdb-service:
+    image: budibase/couchdb
+    environment:
+      - COUCHDB_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_COUCHDB
+      - COUCHDB_USER=$SERVICE_USER_BUDIBASE_COUCHDB
+      - TARGETBUILD=docker-compose
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:5984/"]
+      interval: 15s
+      timeout: 15s
+      retries: 5
+      start_period: 10s
+    volumes:
+      - couchdb3_data:/opt/couchdb/data
+
+  redis-service:
+    image: redis
+    command: redis-server --requirepass "$SERVICE_PASSWORD_BUDIBASE_REDIS"
+    volumes:
+      - redis_data:/data
+    healthcheck:
+      test:
+        ["CMD", "redis-cli", "-a", "$SERVICE_PASSWORD_BUDIBASE_REDIS", "ping"]
+      interval: 15s
+      timeout: 15s
+      retries: 5
+      start_period: 10s
+
+  watchtower-service:
+    restart: always
+    image: containrrr/watchtower
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    command: --debug --http-api-update bbapps bbworker bbproxy
+    environment:
+      - WATCHTOWER_HTTP_API=true
+      - WATCHTOWER_HTTP_API_TOKEN=$SERVICE_PASSWORD_BUDIBASE_WATCHTOWER
+      - WATCHTOWER_CLEANUP=true
+    labels:
+      - "com.centurylinklabs.watchtower.enable=false"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://watchtower-service:8080"]
+      interval: 15s
+      timeout: 15s
+      retries: 5
+      start_period: 10s
--- a/templates/compose/classicpress-with-mysql.yaml
+++ b/templates/compose/classicpress-with-mysql.yaml
@@ -21,8 +21,8 @@ services:
      interval: 2s
      timeout: 10s
      retries: 10
-  mariadb:
-    image: mysql:5.7
+  mysql:
+    image: mysql:8
    volumes:
      - mysql-data:/var/lib/mysql
    environment:
--- a/templates/compose/supabase.yaml
+++ b/templates/compose/supabase.yaml
@@ -278,7 +278,7 @@ services:
                  config:
                    hide_credentials: true
  supabase-studio:
-    image: supabase/studio:20240514-6f5cabd
+    image: supabase/studio:20240729-ce42139
    healthcheck:
      test:
        [
@@ -315,7 +315,7 @@ services:
      # Uncomment to use Big Query backend for analytics
      # NEXT_ANALYTICS_BACKEND_PROVIDER=bigquery
  supabase-db:
-    image: supabase/postgres:15.1.1.41
+    image: supabase/postgres:15.1.1.78
    healthcheck:
      test: pg_isready -U postgres -h 127.0.0.1
      interval: 5s
@@ -895,7 +895,7 @@ services:
    command: ["--config", "etc/vector/vector.yml"]

  supabase-rest:
-    image: postgrest/postgrest:v12.0.1
+    image: postgrest/postgrest:v12.2.0
    depends_on:
      supabase-db:
        # Disable this if you are using an external Postgres database
@@ -941,8 +941,9 @@ services:

      - GOTRUE_DB_DRIVER=postgres
      - GOTRUE_DB_DATABASE_URL=postgres://supabase_auth_admin:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOSTNAME:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
-
+      # The base URL your site is located at. Currently used in combination with other settings to construct URLs used in emails.
      - GOTRUE_SITE_URL=${SERVICE_FQDN_SUPABASEKONG}
+      # A comma separated list of URIs (e.g. "https://foo.example.com,https://*.foo.example.com,https://bar.example.com") which are permitted as valid redirect_to destinations.
      - GOTRUE_URI_ALLOW_LIST=${ADDITIONAL_REDIRECT_URLS}
      - GOTRUE_DISABLE_SIGNUP=${DISABLE_SIGNUP:-false}

@@ -991,10 +992,20 @@ services:

      # GOTRUE_HOOK_PASSWORD_VERIFICATION_ATTEMPT_ENABLED="true"
      # GOTRUE_HOOK_PASSWORD_VERIFICATION_ATTEMPT_URI="pg-functions://postgres/public/password_verification_attempt"
+      
+      # Uncomment to enable common OAuth Variables
+      #- 'GOTRUE_EXTERNAL_GITHUB_CLIENT_ID=${GOTRUE_EXTERNAL_GITHUB_CLIENT_ID}'
+      #- 'GOTRUE_EXTERNAL_GITHUB_ENABLED=${GOTRUE_EXTERNAL_GITHUB_ENABLED}'
+      #- 'GOTRUE_EXTERNAL_GITHUB_REDIRECT_URI=${GOTRUE_EXTERNAL_GITHUB_REDIRECT_URI}'
+      #- 'GOTRUE_EXTERNAL_GITHUB_SECRET=${GOTRUE_EXTERNAL_GITHUB_SECRET}'
+      #- 'GOTRUE_EXTERNAL_GOOGLE_CLIENT_ID=${GOTRUE_EXTERNAL_GOOGLE_CLIENT_ID}'
+      #- 'GOTRUE_EXTERNAL_GOOGLE_ENABLED=${GOTRUE_EXTERNAL_GOOGLE_ENABLED}'
+      #- 'GOTRUE_EXTERNAL_GOOGLE_REDIRECT_URI=${GOTRUE_EXTERNAL_GOOGLE_REDIRECT_URI}'
+      #- 'GOTRUE_EXTERNAL_GOOGLE_SECRET=${GOTRUE_EXTERNAL_GOOGLE_SECRET}'

  realtime-dev:
    # This container name looks inconsistent but is correct because realtime constructs tenant id by parsing the subdomain
-    image: supabase/realtime:v2.28.32
+    image: supabase/realtime:v2.30.23
    container_name: realtime-dev.supabase-realtime
    depends_on:
      supabase-db:
@@ -1034,6 +1045,9 @@ services:
      - ERL_AFLAGS=-proto_dist inet_tcp
      - ENABLE_TAILSCALE=false
      - DNS_NODES=''
+      - RLIMIT_NOFILE=10000
+      - APP_NAME=realtime
+      - SEED_SELF_HOST=true
    command: >
      sh -c "/app/bin/migrate && /app/bin/realtime eval 'Realtime.Release.seeds(Realtime.Repo)' && /app/bin/server"
  supabase-minio:
@@ -1155,7 +1169,7 @@ services:
      - ./volumes/storage:/var/lib/storage

  supabase-meta:
-    image: supabase/postgres-meta:v0.80.0
+    image: supabase/postgres-meta:v0.83.2
    depends_on:
      supabase-db:
        # Disable this if you are using an external Postgres database
--- a/templates/compose/twenty.yaml
+++ b/templates/compose/twenty.yaml
@@ -45,7 +45,7 @@ services:
      - STORAGE_S3_SECRET_ACCESS_KEY=$STORAGE_S3_SECRET_ACCESS_KEY

      # https://twenty.com/developers/section/self-hosting/self-hosting-var#message-queue
-      - MESSAGE_QUEUE_TYPE=$MESSAGE_QUEUE_TYPE
+      - MESSAGE_QUEUE_TYPE=${MESSAGE_QUEUE_TYPE:-pg-boss}

      # https://twenty.com/developers/section/self-hosting/self-hosting-var#email
      - EMAIL_FROM_ADDRESS=$EMAIL_FROM_ADDRESS
--- a/templates/compose/windmill.yaml
+++ b/templates/compose/windmill.yaml
@@ -0,0 +1,97 @@
+# documentation: https://www.windmill.dev/docs/
+# slogan: Windmill is a developer platform to build production-grade multi-steps automations and internal apps.\
+# info: Login as admin@windmill.dev / changeme to setup the instance & accounts and give yourself super-admin privileges.
+# tags: windmill,workflow,automation,developer,platform
+# logo: svgs/windmill.svg
+# port: 8000
+
+version: "3.7"
+
+services:
+  db:
+    image: postgres:16
+    shm_size: 1g
+    restart: unless-stopped
+    volumes:
+      - db_data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: $SERVICE_PASSWORD_WINDMILL_POSTGRES
+      POSTGRES_DB: windmill
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  windmill_server:
+    image: ghcr.io/windmill-labs/windmill:main
+    environment:
+      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill
+      - MODE=server
+      - BASE_URL=$SERVICE_FQDN_WINDMILL
+    depends_on:
+      db:
+        condition: service_healthy
+    volumes:
+      - worker_logs:/tmp/windmill/logs
+
+  windmill_worker_1:
+    image: ghcr.io/windmill-labs/windmill:main
+    environment:
+      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill
+      - MODE=worker
+      - WORKER_GROUP=default
+    depends_on:
+      db:
+        condition: service_healthy
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - worker_dependency_cache:/tmp/windmill/cache
+      - worker_logs:/tmp/windmill/logs
+
+  windmill_worker_2:
+    image: ghcr.io/windmill-labs/windmill:main
+    environment:
+      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill
+      - MODE=worker
+      - WORKER_GROUP=default
+    depends_on:
+      db:
+        condition: service_healthy
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - worker_dependency_cache:/tmp/windmill/cache
+      - worker_logs:/tmp/windmill/logs
+
+  windmill_worker_3:
+    image: ghcr.io/windmill-labs/windmill:main
+    environment:
+      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill
+      - MODE=worker
+      - WORKER_GROUP=default
+    depends_on:
+      db:
+        condition: service_healthy
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - worker_dependency_cache:/tmp/windmill/cache
+      - worker_logs:/tmp/windmill/logs
+
+  windmill_worker_native:
+    image: ghcr.io/windmill-labs/windmill:main
+    environment:
+      - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill
+      - MODE=worker
+      - WORKER_GROUP=native
+      - NUM_WORKERS=8
+      - SLEEP_QUEUE=200
+    depends_on:
+      db:
+        condition: service_healthy
+    volumes:
+      - worker_logs:/tmp/windmill/logs
+
+  lsp:
+    image: ghcr.io/windmill-labs/windmill-lsp:latest
+    volumes:
+      - lsp_cache:/root/.cache
--- a/templates/compose/wordpress-with-mysql.yaml
+++ b/templates/compose/wordpress-with-mysql.yaml
@@ -22,7 +22,7 @@ services:
      timeout: 10s
      retries: 10
  mysql:
-    image: mysql:5.7
+    image: mysql:8
    volumes:
      - mysql-data:/var/lib/mysql
    environment: