fix: resolve broken merge in supabase template, keep canary structure with updated image versions

The previous merge of origin/canary into this branch was committed with unresolved conflict markers in docker-compose.yml and template.toml, producing invalid YAML/TOML. It also carried over the old kong eval-based entrypoint, which made the kong container unhealthy and failed the deploy (dependency kong failed to start). This commit restores the known-good template structure from canary (kong-entrypoint.sh, declarative kong.yml with JWKS/asymmetric key routes, vector + analytics stack, correct domains) and applies only the version bumps intended by this PR: - studio 2026.04.27 -> 2026.06.03-sha-0bca601 - gotrue v2.186.0 -> v2.189.0 - postgrest v14.8 -> v14.12 - realtime v2.76.5 -> v2.102.3 - storage-api v1.48.26 -> v1.60.4 - postgres-meta v0.96.3 -> v0.96.6 - edge-runtime v1.71.2 -> v1.74.0 - postgres 15.8.1.085 -> 17.6.1.136 - supavisor 2.7.4 -> 2.9.5 Deploy-tested on Dokploy: all 13 containers running, kong healthy, studio dashboard reachable through kong (HTTP 200). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-10 00:15:28 +02:00 · 2026-07-08 01:03:04 -06:00
parent 32e67eb0aa
commit ff625d2125
2 changed files with 69 additions and 239 deletions
--- a/blueprints/supabase/docker-compose.yml
+++ b/blueprints/supabase/docker-compose.yml
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-version: "3.8"
-=======
 # Usage
 #   Start:              docker compose up -d
 #   Stop:               docker compose down
@@ -10,84 +7,48 @@ version: "3.8"
 # backend by default; edit the storage service env in this file to switch to S3/MinIO.

 name: supabase
->>>>>>> origin/canary

 services:
+
  studio:
-<<<<<<< HEAD
    image: supabase/studio:2026.06.03-sha-0bca601
-=======
-    image: supabase/studio:2026.04.27-sha-5f60601
->>>>>>> origin/canary
    restart: unless-stopped
    healthcheck:
      test:
        [
          "CMD-SHELL",
-<<<<<<< HEAD
-          "node -e \"fetch('http://localhost:3000/api/platform/profile').then((r) => { if (r.status !== 200) throw new Error(r.status) })\""
-        ]
-      timeout: 10s
-      interval: 5s
-      retries: 3
-      start_period: 20s
-=======
          "node -e \"fetch('http://localhost:3000/api/platform/profile').then((r) => {if (r.status !== 200) throw new Error(r.status)})\""
        ]
      timeout: 10s
      interval: 5s
      retries: 5
      start_period: 30s
->>>>>>> origin/canary
    depends_on:
-      meta:
-        condition: service_started
-    volumes:
-      - ../files/volumes/snippets:/app/snippets:z
-      - ../files/volumes/functions:/app/edge-functions:ro,z
+      analytics:
+        condition: service_healthy
    environment:
      HOSTNAME: "0.0.0.0"
-<<<<<<< HEAD
-=======

->>>>>>> origin/canary
      STUDIO_PG_META_URL: http://meta:8080
      POSTGRES_PORT: ${POSTGRES_PORT}
      POSTGRES_HOST: ${POSTGRES_HOST}
      POSTGRES_DB: ${POSTGRES_DB}
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-<<<<<<< HEAD
-      POSTGRES_USER_READ_WRITE: postgres
-=======

->>>>>>> origin/canary
      PG_META_CRYPTO_KEY: ${PG_META_CRYPTO_KEY}
      PGRST_DB_SCHEMAS: ${PGRST_DB_SCHEMAS}
      PGRST_DB_MAX_ROWS: ${PGRST_DB_MAX_ROWS:-1000}
      PGRST_DB_EXTRA_SEARCH_PATH: ${PGRST_DB_EXTRA_SEARCH_PATH:-public}
-<<<<<<< HEAD
-      DEFAULT_ORGANIZATION_NAME: ${STUDIO_DEFAULT_ORGANIZATION}
-      DEFAULT_PROJECT_NAME: ${STUDIO_DEFAULT_PROJECT}
-      OPENAI_API_KEY: ${OPENAI_API_KEY:-}
-=======

      DEFAULT_ORGANIZATION_NAME: ${STUDIO_DEFAULT_ORGANIZATION}
      DEFAULT_PROJECT_NAME: ${STUDIO_DEFAULT_PROJECT}
      OPENAI_API_KEY: ${OPENAI_API_KEY:-}

->>>>>>> origin/canary
      SUPABASE_URL: http://kong:8000
      SUPABASE_PUBLIC_URL: ${SUPABASE_PUBLIC_URL}
      SUPABASE_ANON_KEY: ${ANON_KEY}
      SUPABASE_SERVICE_KEY: ${SERVICE_ROLE_KEY}
      AUTH_JWT_SECRET: ${JWT_SECRET}
-<<<<<<< HEAD
-      SUPABASE_PUBLISHABLE_KEY: ${SUPABASE_PUBLISHABLE_KEY:-}
-      SUPABASE_SECRET_KEY: ${SUPABASE_SECRET_KEY:-}
-      ENABLED_FEATURES_LOGS_ALL: "false"
-      SNIPPETS_MANAGEMENT_FOLDER: /app/snippets
-      EDGE_FUNCTIONS_MANAGEMENT_FOLDER: /app/edge-functions
-=======

      LOGFLARE_API_KEY: ${LOGFLARE_PUBLIC_ACCESS_TOKEN}
      LOGFLARE_PUBLIC_ACCESS_TOKEN: ${LOGFLARE_PUBLIC_ACCESS_TOKEN}
@@ -101,7 +62,6 @@ services:
    volumes:
      - ../files/volumes/snippets:/app/snippets:Z
      - ../files/volumes/functions:/app/edge-functions:Z
->>>>>>> origin/canary

  kong:
    image: kong/kong:3.9.1
@@ -111,24 +71,11 @@ services:
      interval: 5s
      timeout: 5s
      retries: 5
-<<<<<<< HEAD
-      start_period: 20s
-=======
      start_period: 30s
->>>>>>> origin/canary
    depends_on:
      studio:
        condition: service_healthy
    expose:
-<<<<<<< HEAD
-      - "8000"
-      - "8443"
-    volumes:
-      - ../files/volumes/api/kong.yml:/home/kong/temp.yml:ro,z
-    environment:
-      KONG_DATABASE: "off"
-      KONG_DECLARATIVE_CONFIG: /home/kong/kong.yml
-=======
      - 8000
      - 8443
    volumes:
@@ -137,7 +84,6 @@ services:
    environment:
      KONG_DATABASE: "off"
      KONG_DECLARATIVE_CONFIG: /usr/local/kong/kong.yml
->>>>>>> origin/canary
      KONG_DNS_ORDER: LAST,A,CNAME
      KONG_DNS_NOT_FOUND_TTL: 1
      KONG_PLUGINS: request-transformer,cors,key-auth,acl,basic-auth,request-termination,ip-restriction,post-function
@@ -152,58 +98,51 @@ services:
      SERVICE_ROLE_KEY_ASYMMETRIC: ${SERVICE_ROLE_KEY_ASYMMETRIC:-}
      DASHBOARD_USERNAME: ${DASHBOARD_USERNAME}
      DASHBOARD_PASSWORD: ${DASHBOARD_PASSWORD}
-<<<<<<< HEAD
-    entrypoint: bash -c 'eval "echo \"$$(cat ~/temp.yml)\"" > ~/kong.yml && /docker-entrypoint.sh kong docker-start'
-
-  auth:
-    image: supabase/gotrue:v2.189.0
-=======
    entrypoint: ["/bin/bash", "/home/kong/kong-entrypoint.sh"]

  auth:
-    image: supabase/gotrue:v2.186.0
->>>>>>> origin/canary
+    image: supabase/gotrue:v2.189.0
    restart: unless-stopped
    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:9999/health"]
+      test:
+        [
+          "CMD",
+          "wget",
+          "--no-verbose",
+          "--tries=1",
+          "--spider",
+          "http://localhost:9999/health"
+        ]
      timeout: 5s
      interval: 5s
      retries: 3
-      start_period: 10s
    depends_on:
      db:
        condition: service_healthy
    environment:
-<<<<<<< HEAD
-=======
      GOTRUE_MAILER_EXTERNAL_HOSTS: kong,${SUPABASE_HOST}
->>>>>>> origin/canary
      GOTRUE_API_HOST: 0.0.0.0
      GOTRUE_API_PORT: 9999
      API_EXTERNAL_URL: ${API_EXTERNAL_URL}
+
      GOTRUE_DB_DRIVER: postgres
      GOTRUE_DB_DATABASE_URL: postgres://supabase_auth_admin:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
+
      GOTRUE_SITE_URL: ${SITE_URL}
      GOTRUE_URI_ALLOW_LIST: ${ADDITIONAL_REDIRECT_URLS}
      GOTRUE_DISABLE_SIGNUP: ${DISABLE_SIGNUP}
+
      GOTRUE_JWT_ADMIN_ROLES: service_role
      GOTRUE_JWT_AUD: authenticated
      GOTRUE_JWT_DEFAULT_GROUP_NAME: authenticated
      GOTRUE_JWT_EXP: ${JWT_EXPIRY}
      GOTRUE_JWT_SECRET: ${JWT_SECRET}
-<<<<<<< HEAD
-      GOTRUE_JWT_ISSUER: ${API_EXTERNAL_URL}/auth/v1
-      GOTRUE_EXTERNAL_EMAIL_ENABLED: ${ENABLE_EMAIL_SIGNUP}
-      GOTRUE_EXTERNAL_ANONYMOUS_USERS_ENABLED: ${ENABLE_ANONYMOUS_USERS}
-      GOTRUE_MAILER_AUTOCONFIRM: ${ENABLE_EMAIL_AUTOCONFIRM}
-=======
      GOTRUE_JWT_KEYS: ${JWT_KEYS:-[]}

      GOTRUE_EXTERNAL_EMAIL_ENABLED: ${ENABLE_EMAIL_SIGNUP}
      GOTRUE_EXTERNAL_ANONYMOUS_USERS_ENABLED: ${ENABLE_ANONYMOUS_USERS}
      GOTRUE_MAILER_AUTOCONFIRM: ${ENABLE_EMAIL_AUTOCONFIRM}

->>>>>>> origin/canary
      GOTRUE_SMTP_ADMIN_EMAIL: ${SMTP_ADMIN_EMAIL}
      GOTRUE_SMTP_HOST: ${SMTP_HOST}
      GOTRUE_SMTP_PORT: ${SMTP_PORT}
@@ -214,59 +153,43 @@ services:
      GOTRUE_MAILER_URLPATHS_CONFIRMATION: ${MAILER_URLPATHS_CONFIRMATION}
      GOTRUE_MAILER_URLPATHS_RECOVERY: ${MAILER_URLPATHS_RECOVERY}
      GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE: ${MAILER_URLPATHS_EMAIL_CHANGE}
+
      GOTRUE_EXTERNAL_PHONE_ENABLED: ${ENABLE_PHONE_SIGNUP}
      GOTRUE_SMS_AUTOCONFIRM: ${ENABLE_PHONE_AUTOCONFIRM}

  rest:
-<<<<<<< HEAD
    image: postgrest/postgrest:v14.12
-=======
-    image: postgrest/postgrest:v14.8
->>>>>>> origin/canary
    restart: unless-stopped
    depends_on:
      db:
        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "postgrest", "--ready"]
-      interval: 5s
-      timeout: 5s
-      retries: 3
-      start_period: 10s
    environment:
      PGRST_DB_URI: postgres://authenticator:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
      PGRST_DB_SCHEMAS: ${PGRST_DB_SCHEMAS}
      PGRST_DB_MAX_ROWS: ${PGRST_DB_MAX_ROWS:-1000}
      PGRST_DB_EXTRA_SEARCH_PATH: ${PGRST_DB_EXTRA_SEARCH_PATH:-public}
      PGRST_DB_ANON_ROLE: anon
-      PGRST_ADMIN_SERVER_PORT: 3001
-      PGRST_ADMIN_SERVER_HOST: localhost
-      PGRST_JWT_SECRET: ${JWT_JWKS:-${JWT_SECRET}}
+      PGRST_JWT_SECRET: ${JWT_SECRET}
      PGRST_DB_USE_LEGACY_GUCS: "false"
      PGRST_APP_SETTINGS_JWT_SECRET: ${JWT_SECRET}
      PGRST_APP_SETTINGS_JWT_EXP: ${JWT_EXPIRY}
-    command: ["postgrest"]
+    command:
+      [
+        "postgrest"
+      ]

  realtime:
-<<<<<<< HEAD
    image: supabase/realtime:v2.102.3
-=======
-    image: supabase/realtime:v2.76.5
->>>>>>> origin/canary
    restart: unless-stopped
    depends_on:
      db:
        condition: service_healthy
    healthcheck:
-<<<<<<< HEAD
-      test: ["CMD-SHELL", "curl -sSfL --head -o /dev/null -H \"Authorization: Bearer ${ANON_KEY}\" http://localhost:4000/api/tenants/realtime-dev/health"]
-=======
      test:
        [
          "CMD-SHELL",
          "curl -sSfL --head -o /dev/null -H \"Authorization: Bearer ${ANON_KEY}\" http://localhost:4000/api/tenants/realtime-dev/health"
        ]
->>>>>>> origin/canary
      timeout: 5s
      interval: 30s
      retries: 3
@@ -292,11 +215,7 @@ services:
      DISABLE_HEALTHCHECK_LOGGING: "true"

  storage:
-<<<<<<< HEAD
    image: supabase/storage-api:v1.60.4
-=======
-    image: supabase/storage-api:v1.48.26
->>>>>>> origin/canary
    restart: unless-stopped
    depends_on:
      db:
@@ -306,9 +225,6 @@ services:
      imgproxy:
        condition: service_started
    healthcheck:
-<<<<<<< HEAD
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://storage:5000/status"]
-=======
      test:
        [
          "CMD",
@@ -318,7 +234,6 @@ services:
          "--spider",
          "http://storage:5000/status"
        ]
->>>>>>> origin/canary
      timeout: 5s
      interval: 5s
      retries: 3
@@ -333,13 +248,8 @@ services:
      DATABASE_URL: postgres://supabase_storage_admin:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
      STORAGE_PUBLIC_URL: ${SUPABASE_PUBLIC_URL}
      REQUEST_ALLOW_X_FORWARDED_PATH: "true"
-<<<<<<< HEAD
-      FILE_SIZE_LIMIT: ${STORAGE_FILE_SIZE_LIMIT:-52428800}
-      STORAGE_BACKEND: ${STORAGE_BACKEND:-file}
-=======
      FILE_SIZE_LIMIT: 52428800
      STORAGE_BACKEND: file
->>>>>>> origin/canary
      GLOBAL_S3_BUCKET: ${GLOBAL_S3_BUCKET}
      FILE_STORAGE_BACKEND_PATH: /var/lib/storage
      TENANT_ID: ${STORAGE_TENANT_ID}
@@ -355,11 +265,15 @@ services:
    volumes:
      - ../files/volumes/storage:/var/lib/storage:z
    healthcheck:
-      test: ["CMD", "imgproxy", "health"]
+      test:
+        [
+          "CMD",
+          "imgproxy",
+          "health"
+        ]
      timeout: 5s
      interval: 5s
      retries: 3
-      start_period: 10s
    environment:
      IMGPROXY_BIND: ":5001"
      IMGPROXY_LOCAL_FILESYSTEM_ROOT: /
@@ -368,11 +282,7 @@ services:
      IMGPROXY_MAX_SRC_RESOLUTION: 16.8

  meta:
-<<<<<<< HEAD
    image: supabase/postgres-meta:v0.96.6
-=======
-    image: supabase/postgres-meta:v0.96.3
->>>>>>> origin/canary
    restart: unless-stopped
    depends_on:
      db:
@@ -382,33 +292,19 @@ services:
      PG_META_DB_HOST: ${POSTGRES_HOST}
      PG_META_DB_PORT: ${POSTGRES_PORT}
      PG_META_DB_NAME: ${POSTGRES_DB}
-      PG_META_DB_USER: postgres
+      PG_META_DB_USER: supabase_admin
      PG_META_DB_PASSWORD: ${POSTGRES_PASSWORD}
      CRYPTO_KEY: ${PG_META_CRYPTO_KEY}

  functions:
-<<<<<<< HEAD
    image: supabase/edge-runtime:v1.74.0
    restart: unless-stopped
-=======
-    image: supabase/edge-runtime:v1.71.2
-    restart: unless-stopped
    volumes:
      - ../files/volumes/functions:/home/deno/functions:Z
      - deno-cache:/root/.cache/deno
->>>>>>> origin/canary
    depends_on:
      kong:
        condition: service_healthy
-    healthcheck:
-      test: ["CMD-SHELL", "timeout 1 bash -c '</dev/tcp/127.0.0.1/9000'"]
-      interval: 5s
-      timeout: 5s
-      retries: 3
-      start_period: 10s
-    volumes:
-      - ../files/volumes/functions:/home/deno/functions:z
-      - deno-cache:/root/.cache/deno
    environment:
      JWT_SECRET: ${JWT_SECRET}
      SUPABASE_URL: http://kong:8000
@@ -419,12 +315,13 @@ services:
      SUPABASE_SECRET_KEYS: "{\"default\":\"${SUPABASE_SECRET_KEY:-}\"}"
      SUPABASE_DB_URL: postgresql://postgres:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
      VERIFY_JWT: "${FUNCTIONS_VERIFY_JWT}"
-    command: ["start", "--main-service", "/home/deno/functions/main"]
+    command:
+      [
+        "start",
+        "--main-service",
+        "/home/deno/functions/main"
+      ]

-<<<<<<< HEAD
-  db:
-    image: supabase/postgres:17.6.1.136
-=======
  analytics:
    image: supabase/logflare:1.36.1
    restart: unless-stopped
@@ -462,27 +359,13 @@ services:
      LOGFLARE_FEATURE_FLAG_OVERRIDE: multibackend=true

  db:
-    image: supabase/postgres:15.8.1.085
->>>>>>> origin/canary
+    image: supabase/postgres:17.6.1.136
    restart: unless-stopped
    volumes:
      - ../files/volumes/db/realtime.sql:/docker-entrypoint-initdb.d/migrations/99-realtime.sql:Z
      - ../files/volumes/db/webhooks.sql:/docker-entrypoint-initdb.d/init-scripts/98-webhooks.sql:Z
      - ../files/volumes/db/roles.sql:/docker-entrypoint-initdb.d/init-scripts/99-roles.sql:Z
      - ../files/volumes/db/jwt.sql:/docker-entrypoint-initdb.d/init-scripts/99-jwt.sql:Z
-<<<<<<< HEAD
-      - ../files/volumes/db/_supabase.sql:/docker-entrypoint-initdb.d/migrations/97-_supabase.sql:Z
-      - ../files/volumes/db/logs.sql:/docker-entrypoint-initdb.d/migrations/99-logs.sql:Z
-      - ../files/volumes/db/pooler.sql:/docker-entrypoint-initdb.d/migrations/99-pooler.sql:Z
-      - ../files/volumes/db/data:/var/lib/postgresql/data:Z
-      - db-config:/etc/postgresql-custom
-    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "postgres", "-h", "localhost"]
-      interval: 5s
-      timeout: 5s
-      retries: 10
-      start_period: 20s
-=======
      - ../files/volumes/db/data:/var/lib/postgresql/data:Z
      - ../files/volumes/db/_supabase.sql:/docker-entrypoint-initdb.d/migrations/97-_supabase.sql:Z
      - ../files/volumes/db/logs.sql:/docker-entrypoint-initdb.d/migrations/99-logs.sql:Z
@@ -505,7 +388,6 @@ services:
    depends_on:
      vector:
        condition: service_healthy
->>>>>>> origin/canary
    environment:
      POSTGRES_HOST: /var/run/postgresql
      PGPORT: ${POSTGRES_PORT}
@@ -516,28 +398,6 @@ services:
      POSTGRES_DB: ${POSTGRES_DB}
      JWT_SECRET: ${JWT_SECRET}
      JWT_EXP: ${JWT_EXPIRY}
-<<<<<<< HEAD
-    command: ["postgres", "-c", "config_file=/etc/postgresql/postgresql.conf", "-c", "log_min_messages=fatal"]
-
-  supavisor:
-    image: supabase/supavisor:2.9.5
-    restart: unless-stopped
-    depends_on:
-      db:
-        condition: service_healthy
-    expose:
-      - "4000"
-      - "5432"
-      - "6543"
-    volumes:
-      - ../files/volumes/pooler/pooler.exs:/etc/pooler/pooler.exs:ro,z
-    healthcheck:
-      test: ["CMD", "curl", "-sSfL", "--head", "-o", "/dev/null", "http://127.0.0.1:4000/api/health"]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-      start_period: 30s
-=======
    command:
      [
        "postgres",
@@ -578,7 +438,7 @@ services:
      - "label=disable"

  supavisor:
-    image: supabase/supavisor:2.7.4
+    image: supabase/supavisor:2.9.5
    restart: unless-stopped
    expose:
      - "5432"
@@ -603,7 +463,6 @@ services:
    depends_on:
      db:
        condition: service_healthy
->>>>>>> origin/canary
    environment:
      PORT: 4000
      POSTGRES_PORT: ${POSTGRES_PORT}
@@ -623,16 +482,12 @@ services:
      POOLER_MAX_CLIENT_CONN: ${POOLER_MAX_CLIENT_CONN}
      POOLER_POOL_MODE: transaction
      DB_POOL_SIZE: ${POOLER_DB_POOL_SIZE}
-<<<<<<< HEAD
-    command: ["/bin/sh", "-c", "/app/bin/migrate && /app/bin/supavisor eval \"$$(cat /etc/pooler/pooler.exs)\" && /app/bin/server"]
-=======
    command:
      [
        "/bin/sh",
        "-c",
        "/app/bin/migrate && /app/bin/supavisor eval \"$$(cat /etc/pooler/pooler.exs)\" && /app/bin/server"
      ]
->>>>>>> origin/canary

 volumes:
  db-config:
--- a/blueprints/supabase/template.toml
+++ b/blueprints/supabase/template.toml
@@ -2,24 +2,15 @@
 main_domain = "${domain}"
 postgres_password = "${password:32}"
 dashboard_password = "${password:32}"
-<<<<<<< HEAD
-=======
 logflare_public_access_token = "${password:32}"
 logflare_private_access_token = "${password:32}"
 pg_meta_crypto_key = "${password:32}"
 s3_protocol_access_key_id = "${password:24}"
 s3_protocol_access_key_secret = "${password:48}"
->>>>>>> origin/canary
 secret_key_base = "${password:64}"
 vault_enc_key = "${password:32}"
-pg_meta_crypto_key = "${password:32}"
-s3_protocol_access_key_id = "${password:24}"
-s3_protocol_access_key_secret = "${password:48}"
 jwt_secret = "${password:32}"
-<<<<<<< HEAD
-=======
 pooler_tenant_id = "${uuid}"
->>>>>>> origin/canary
 anon_key_payload = """{
  "role": "anon",
  "iss": "supabase",
@@ -41,11 +32,6 @@ host = "${main_domain}"
 [config]
 env = [
 '############',
-<<<<<<< HEAD
-'# Production Supabase configuration for Dokploy.',
-'# Configure SUPABASE_PUBLIC_URL/API_EXTERNAL_URL with https after assigning a Dokploy domain.',
-'# Configure SMTP_* before enabling production auth emails.',
-=======
 '# To get a proper working configuration you should at least take a look at:',
 '# - SUPABASE_PUBLIC_URL, API_EXTERNAL_URL should point to your supabase domain with correct http/https scheme',
 '# - SMTP_* are required for auth mail sending',
@@ -61,7 +47,6 @@ env = [
 '# In this version of the template they are generated randomly by dokploy helpers',
 '# so you do not need to change them manually',
 '# Go to https://supabase.com/docs/guides/self-hosting for more information',
->>>>>>> origin/canary
 '############',
 '',
 'SUPABASE_HOST=${main_domain}',
@@ -74,8 +59,6 @@ env = [
 'SECRET_KEY_BASE=${secret_key_base}',
 'VAULT_ENC_KEY=${vault_enc_key}',
 'PG_META_CRYPTO_KEY=${pg_meta_crypto_key}',
-<<<<<<< HEAD
-=======
 'LOGFLARE_PUBLIC_ACCESS_TOKEN=${logflare_public_access_token}',
 'LOGFLARE_PRIVATE_ACCESS_TOKEN=${logflare_private_access_token}',
 '',
@@ -83,23 +66,19 @@ env = [
 '############',
 '# Database - You can change these to any PostgreSQL database that has logical replication enabled.',
 '############',
->>>>>>> origin/canary
 '',
 'POSTGRES_HOST=db',
 'POSTGRES_DB=postgres',
 'POSTGRES_PORT=5432',
-<<<<<<< HEAD
-=======
 'POSTGRES_USER=postgres',
->>>>>>> origin/canary
 '',
+'',
+'############',
+'# Supavisor -- Database pooler',
+'############',
 'POOLER_PROXY_PORT_TRANSACTION=6543',
 'POOLER_DEFAULT_POOL_SIZE=20',
 'POOLER_MAX_CLIENT_CONN=100',
-<<<<<<< HEAD
-'POOLER_DB_POOL_SIZE=5',
-'POOLER_TENANT_ID=default',
-=======
 'POOLER_TENANT_ID=${pooler_tenant_id}',
 'POOLER_DB_POOL_SIZE=5',
 '',
@@ -108,15 +87,25 @@ env = [
 '# API Proxy - Configuration for the Kong Reverse proxy.',
 '# Following ports should not be changed for a dokploy config unless you know what you are doing.',
 '############',
->>>>>>> origin/canary
 '',
 'KONG_HTTP_PORT=8000',
 'KONG_HTTPS_PORT=8443',
 '',
+'',
+'############',
+'# API - Configuration for PostgREST.',
+'############',
+'',
 'PGRST_DB_SCHEMAS=public,storage,graphql_public',
 'PGRST_DB_MAX_ROWS=1000',
 'PGRST_DB_EXTRA_SEARCH_PATH=public',
 '',
+'',
+'############',
+'# Auth - Configuration for the GoTrue authentication server.',
+'############',
+'',
+'## General',
 'SITE_URL=http://localhost:3000',
 'ADDITIONAL_REDIRECT_URLS=https://${main_domain}/*,http://localhost:3000/*',
 'JWT_EXPIRY=3600',
@@ -124,11 +113,13 @@ env = [
 'API_EXTERNAL_URL=https://${main_domain}',
 'JWT_KEYS=[]',
 '',
-'MAILER_URLPATHS_CONFIRMATION=/auth/v1/verify',
-'MAILER_URLPATHS_INVITE=/auth/v1/verify',
-'MAILER_URLPATHS_RECOVERY=/auth/v1/verify',
-'MAILER_URLPATHS_EMAIL_CHANGE=/auth/v1/verify',
+'## Mailer Config',
+'MAILER_URLPATHS_CONFIRMATION="/auth/v1/verify"',
+'MAILER_URLPATHS_INVITE="/auth/v1/verify"',
+'MAILER_URLPATHS_RECOVERY="/auth/v1/verify"',
+'MAILER_URLPATHS_EMAIL_CHANGE="/auth/v1/verify"',
 '',
+'## Email auth',
 'ENABLE_EMAIL_SIGNUP=true',
 'ENABLE_EMAIL_AUTOCONFIRM=false',
 'SMTP_ADMIN_EMAIL=admin@example.com',
@@ -139,16 +130,17 @@ env = [
 'SMTP_SENDER_NAME=fake_sender',
 'ENABLE_ANONYMOUS_USERS=false',
 '',
+'## Phone auth',
 'ENABLE_PHONE_SIGNUP=true',
 'ENABLE_PHONE_AUTOCONFIRM=true',
 '',
+'',
+'############',
+'# Studio - Configuration for the Dashboard',
+'############',
+'',
 'STUDIO_DEFAULT_ORGANIZATION=Default Organization',
 'STUDIO_DEFAULT_PROJECT=Default Project',
-<<<<<<< HEAD
-'SUPABASE_PUBLIC_URL=http://${main_domain}',
-'SUPABASE_PUBLISHABLE_KEY=',
-'SUPABASE_SECRET_KEY=',
-=======
 '',
 'SUPABASE_PUBLIC_URL=https://${main_domain}',
 '',
@@ -165,22 +157,16 @@ env = [
 'IMGPROXY_AUTO_WEBP=true',
 '',
 '# Add your OpenAI API key to enable SQL Editor Assistant',
->>>>>>> origin/canary
 'OPENAI_API_KEY=',
 '',
+'',
+'############',
+'# Functions - Configuration for Functions',
+'############',
+'# NOTE: VERIFY_JWT applies to all functions. Per-function VERIFY_JWT is not supported yet.',
 'FUNCTIONS_VERIFY_JWT=false',
 '',
-'STORAGE_FILE_SIZE_LIMIT=52428800',
-'STORAGE_BACKEND=file',
-'STORAGE_TENANT_ID=stub',
-'GLOBAL_S3_BUCKET=stub',
-'REGION=local',
-'S3_PROTOCOL_ACCESS_KEY_ID=${s3_protocol_access_key_id}',
-'S3_PROTOCOL_ACCESS_KEY_SECRET=${s3_protocol_access_key_secret}',
 '',
-<<<<<<< HEAD
-'IMGPROXY_AUTO_WEBP=true']
-=======
 '############',
 '# Logs - Configuration for Logflare',
 '############',
@@ -191,7 +177,6 @@ env = [
 '# Google Cloud Project details',
 'GOOGLE_PROJECT_ID=GOOGLE_PROJECT_ID',
 'GOOGLE_PROJECT_NUMBER=GOOGLE_PROJECT_NUMBER']
->>>>>>> origin/canary

 [[config.mounts]]
 filePath = "/volumes/api/kong-entrypoint.sh"
@@ -441,11 +426,7 @@ services:
            - admin
            - anon
  - name: realtime-v1-rest
-<<<<<<< HEAD
-    _comment: 'Realtime: /realtime/v1/* -> ws://realtime:4000/socket/*'
-=======
    _comment: 'Realtime: /realtime/v1/api/* -> http://realtime:4000/api/*'
->>>>>>> origin/canary
    url: http://realtime:4000/api
    protocol: http
    routes:
@@ -514,8 +495,6 @@ services:
    plugins:
      - name: cors

-<<<<<<< HEAD
-=======
  ## OAuth 2.0 Authorization Server Metadata
  - name: well-known-oauth
    url: http://auth:9999/.well-known/oauth-authorization-server
@@ -526,7 +505,6 @@ services:
          - /.well-known/oauth-authorization-server
    plugins:
      - name: cors
->>>>>>> origin/canary

  ## Secure Database routes
  - name: meta
@@ -1030,8 +1008,6 @@ Deno.serve(async (req: Request) => {
 """

 [[config.mounts]]
-<<<<<<< HEAD
-=======
 filePath = "/volumes/logs/vector.yml"
 content = """api:
  enabled: true
@@ -1304,7 +1280,6 @@ sinks:
 """

 [[config.mounts]]
->>>>>>> origin/canary
 filePath = "/volumes/pooler/pooler.exs"
 content = """{:ok, _} = Application.ensure_all_started(:supavisor)