v1.54.1 with minimal changes to upstream

.docker/docker-compose-infra.yml

@@ -1,14 +1,13 @@
 # docker-compose.yml
 
 services:
-
   tenant_db:
     image: postgres:15
-    shm_size: '1gb'
+    shm_size: "1gb"
     ports:
-      - '5432:5432'
+      - "5432:5432"
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready", "-d", "postgres" ]
+      test: ["CMD-SHELL", "pg_isready", "-d", "postgres"]
       interval: 5s
       timeout: 60s
       retries: 20
@@ -21,12 +20,12 @@ services:
   multitenant_db:
     image: postgres:15
     ports:
-      - '5433:5432'
+      - "5433:5432"
     configs:
       - source: init.sql
         target: /docker-entrypoint-initdb.d/init.sql
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready", "-d", "postgres" ]
+      test: ["CMD-SHELL", "pg_isready", "-d", "postgres"]
       interval: 5s
       timeout: 60s
       retries: 20
@@ -36,9 +35,11 @@ services:
       POSTGRES_PASSWORD: postgres
 
   pg_bouncer:
-    image: bitnami/pgbouncer:latest
+    image: bitnamilegacy/pgbouncer:latest
     ports:
       - 6453:6432
+    depends_on:
+      - tenant_db
     environment:
       POSTGRESQL_USERNAME: postgres
       POSTGRESQL_HOST: tenant_db
@@ -47,76 +48,92 @@ services:
       PGBOUNCER_IGNORE_STARTUP_PARAMETERS: "extra_float_digits, options"
       PGBOUNCER_STATS_USERS: postgres
 
-  supavisor:
-    image: supabase/supavisor:1.1.23
-    depends_on:
-      multitenant_db:
-        condition: service_healthy
-      tenant_db:
-        condition: service_healthy
+  multitenant_pgbouncer:
+    image: bitnamilegacy/pgbouncer:latest
     ports:
-      - 4000:4000
-      - 5452:5452
-      - 6543:6543
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:4000/api/health"]
-      interval: 2s
-      timeout: 10s
-      retries: 5
+      - 6454:6432
+    depends_on:
+      - multitenant_db
     environment:
-      PORT: 4000
-      PROXY_PORT_SESSION: 5452
-      PROXY_PORT_TRANSACTION: 6543
-      DATABASE_URL: "ecto://postgres:postgres@multitenant_db:5432/postgres"
-      CLUSTER_POSTGRES: "true"
-      SECRET_KEY_BASE: "12345678901234567890121234567890123456789012345678903212345678901234567890123456789032123456789012345678901234567890323456789032"
-      VAULT_ENC_KEY: "12345678901234567890123456789032"
-      API_JWT_SECRET: "dev"
-      METRICS_JWT_SECRET: "dev"
-      REGION: "local"
-      ERL_AFLAGS: -proto_dist inet_tcp
-    command: sh -c "/app/bin/migrate && /app/bin/server"
+      POSTGRESQL_USERNAME: postgres
+      POSTGRESQL_HOST: multitenant_db
+      POSTGRESQL_PASSWORD: postgres
+      POSTGRESQL_DATABASE: postgres
+      POSTGRESQL_PORT: 5432
+      PGBOUNCER_POOL_MODE: transaction
+      PGBOUNCER_IGNORE_STARTUP_PARAMETERS: "extra_float_digits, options, statement_timeout"
+      PGBOUNCER_STATS_USERS: postgres
 
-  supavisor_setup:
-    image: supabase/supavisor:1.1.23
-    command: |
-      curl -X PUT \
-        "http://supavisor:4000/api/tenants/bjhaohmqunupljrqypxz" \
-        --header "Accept: application/json" \
-        --header "Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJvbGUiOiJhbm9uIiwiaWF0IjoxNjQ1MTkyODI0LCJleHAiOjE5NjA3Njg4MjR9.M9jrxyvPLkUxWgOYSf5dNdJ8v_eRrq810ShFRT8N-6M" \
-        --header "Content-Type: application/json" \
-        --data-raw "{
-          \"tenant\": {
-            \"db_host\": \"tenant_db\",
-            \"db_port\": 5432,
-            \"db_database\": \"postgres\",
-            \"ip_version\": \"auto\",
-            \"require_user\": true,
-            \"upstream_ssl\": false,
-            \"enforce_ssl\": false,
-            \"default_max_clients\": 200,
-            \"default_pool_size\": 15,
-            \"users\": [
-              {
-                \"db_user\": \"postgres\",
-                \"db_password\": \"postgres\",
-                \"mode_type\": \"transaction\",
-                \"pool_size\": 15,
-                \"max_clients\": 200,
-                \"pool_checkout_timeout\": 5000
-              }
-            ]
-          }
-        }"
-    depends_on:
-      supavisor:
-        condition: service_healthy
+  #  supavisor:
+  #    image: supabase/supavisor:1.1.23
+  #    depends_on:
+  #      multitenant_db:
+  #        condition: service_healthy
+  #      tenant_db:
+  #        condition: service_healthy
+  #    ports:
+  #      - 4000:4000
+  #      - 5452:5452
+  #      - 6543:6543
+  #    healthcheck:
+  #      test: ["CMD", "curl", "-f", "http://localhost:4000/api/health"]
+  #      interval: 2s
+  #      timeout: 10s
+  #      retries: 5
+  #    environment:
+  #      PORT: 4000
+  #      PROXY_PORT_SESSION: 5452
+  #      PROXY_PORT_TRANSACTION: 6543
+  #      DATABASE_URL: "ecto://postgres:postgres@multitenant_db:5432/postgres"
+  #      CLUSTER_POSTGRES: "true"
+  #      SECRET_KEY_BASE: "12345678901234567890121234567890123456789012345678903212345678901234567890123456789032123456789012345678901234567890323456789032"
+  #      VAULT_ENC_KEY: "12345678901234567890123456789032"
+  #      API_JWT_SECRET: "dev"
+  #      METRICS_JWT_SECRET: "dev"
+  #      REGION: "local"
+  #      ERL_AFLAGS: -proto_dist inet_tcp
+  #    command: sh -c "/app/bin/migrate && /app/bin/server"
+  #
+  #  supavisor_setup:
+  #    image: supabase/supavisor:1.1.23
+  #    command: |
+  #      curl -X PUT \
+  #        "http://supavisor:4000/api/tenants/bjhaohmqunupljrqypxz" \
+  #        --header "Accept: application/json" \
+  #        --header "Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJvbGUiOiJhbm9uIiwiaWF0IjoxNjQ1MTkyODI0LCJleHAiOjE5NjA3Njg4MjR9.M9jrxyvPLkUxWgOYSf5dNdJ8v_eRrq810ShFRT8N-6M" \
+  #        --header "Content-Type: application/json" \
+  #        --data-raw "{
+  #          \"tenant\": {
+  #            \"db_host\": \"tenant_db\",
+  #            \"db_port\": 5432,
+  #            \"db_database\": \"postgres\",
+  #            \"ip_version\": \"auto\",
+  #            \"require_user\": true,
+  #            \"upstream_ssl\": false,
+  #            \"enforce_ssl\": false,
+  #            \"default_max_clients\": 200,
+  #            \"default_pool_size\": 15,
+  #            \"users\": [
+  #              {
+  #                \"db_user\": \"postgres\",
+  #                \"db_password\": \"postgres\",
+  #                \"mode_type\": \"transaction\",
+  #                \"pool_size\": 15,
+  #                \"max_clients\": 200,
+  #                \"pool_checkout_timeout\": 5000
+  #              }
+  #            ]
+  #          }
+  #        }"
+  #    depends_on:
+  #      supavisor:
+  #        condition: service_healthy
 
   minio:
     image: minio/minio
     ports:
-      - '9000:9000'
-      - '9001:9001'
+      - "9000:9000"
+      - "9001:9001"
     networks:
       default:
         aliases:
@@ -149,7 +166,7 @@ services:
   imgproxy:
     image: darthsim/imgproxy
     ports:
-      - '50020:8080'
+      - "50020:8080"
     volumes:
       - ${PWD}/data:${PWD}/data
     environment:
@@ -177,25 +194,43 @@ services:
       - CATALOG_IO__IMPL=org.apache.iceberg.aws.s3.S3FileIO
       - CATALOG_S3_ENDPOINT=http://minio:9000
 
-# Optional for rate-limiting
-#  redis:
-#    image: redis:6.2-alpine
-#    restart: always
-#    ports:
-#      - '6379:6379'
+  # Optional for rate-limiting
+  #  redis:
+  #    image: redis:6.2-alpine
+  #    restart: always
+  #    ports:
+  #      - '6379:6379'
+
+  # Optional for tracing
+  otel:
+    profiles:
+      - monitoring
+    extends:
+      service: otel-collector
+      file: ./.docker/docker-compose-monitoring.yml
+
+  jaeger:
+    profiles:
+      - monitoring
+    extends:
+      service: jaeger
+      file: ./.docker/docker-compose-monitoring.yml
+
+  grafana:
+    profiles:
+      - monitoring
+    extends:
+      service: grafana
+      file: ./.docker/docker-compose-monitoring.yml
 
-# Optional for tracing
-#  otel:
-#    extends:
-#      service: otel-collector
-#      file: ./.docker/docker-compose-monitoring.yml
-#
-#  jaeger:
-#    extends:
-#      service: jaeger
-#      file: ./.docker/docker-compose-monitoring.yml
+  prometheus:
+    profiles:
+      - monitoring
+    extends:
+      service: prometheus
+      file: ./.docker/docker-compose-monitoring.yml
 
 configs:
   init.sql:
     content: |
-      CREATE SCHEMA IF NOT EXISTS _supavisor;
+      CREATE SCHEMA IF NOT EXISTS _supavisor;

.docker/docker-compose-monitoring.yml

@@ -24,7 +24,8 @@ services:
     image: prom/prometheus
     container_name: prometheus
     command:
-      - '--config.file=/etc/prometheus/prometheus.yml'
+      - "--config.file=/etc/prometheus/prometheus.yml"
+      - "--web.enable-remote-write-receiver"
     ports:
       - 9090:9090
     restart: unless-stopped
@@ -47,22 +48,23 @@ services:
   jaeger:
     image: jaegertracing/all-in-one:1.57.0
     ports:
-      - "16686:16686"  # Jaeger UI
-      - "14250:14250"  # GRPC
-      - "14268:14268"  # HTTP
-      - "14269:14269"  # HTTP
-      - "6831:6831/udp"  # UDP
-      - "6832:6832/udp"  # UDP
-      - "5778:5778"  # HTTP
+      - "16686:16686" # Jaeger UI
+      - "14250:14250" # GRPC
+      - "14268:14268" # HTTP
+      - "14269:14269" # HTTP
+      - "6831:6831/udp" # UDP
+      - "6832:6832/udp" # UDP
+      - "5778:5778" # HTTP
 
   otel-collector:
     image: otel/opentelemetry-collector-contrib:0.100.0
     ports:
-      - "4317:4317"  # OTLP gRPC receiver
-      - "4318:4318"  # OTLP Http receiver
-      - "55680:55680"  # OTLP HTTP receiver
-    command: [ "--config=/etc/otel/otel-collector-config.yml" ]
+      - "4317:4317" # OTLP gRPC receiver
+      - "4318:4318" # OTLP Http receiver
+      - "55680:55680" # OTLP HTTP receiver
+      - "9200:9200" # Prometheus metrics receiver
+    command: ["--config=/etc/otel/otel-collector-config.yml"]
     depends_on:
       - jaeger
     volumes:
-      - ../monitoring/otel/config:/etc/otel
+      - ../monitoring/otel/config:/etc/otel

.docker/pgbouncer/Dockerfile

@@ -0,0 +1,17 @@
+FROM edoburu/pgbouncer:v1.25.1-p0
+
+USER root
+RUN apk add --no-cache bash
+
+COPY --chown=postgres:postgres pgbouncer.ini.template /etc/pgbouncer/pgbouncer.ini.template
+COPY --chown=postgres:postgres entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+EXPOSE 6432
+
+USER postgres
+
+HEALTHCHECK --interval=10s --timeout=3s --start-period=5s --retries=3 \
+    CMD printf "SHOW VERSION;\n" | nc 127.0.0.1 6432 >/dev/null 2>&1 || exit 1
+
+ENTRYPOINT ["/entrypoint.sh"]