From e23000f27078dad270cdc66576e4e638bf9e8dc4 Mon Sep 17 00:00:00 2001
From: Iraq Jaber <iraq+github@zitadel.com>
Date: Tue, 25 Mar 2025 16:57:18 +0000
Subject: [PATCH] Reapply "replaced cockroach with postgres"

This reverts commit 4bc7b0a6877987d0351e3ff35677d1ebeb6b50fa.
---
 e2e/config/host.docker.internal/zitadel.yaml | 17 ++++++++++++++---
 e2e/config/localhost/docker-compose.yaml     | 11 ++++++-----
 e2e/config/localhost/zitadel.yaml            | 16 ++++++++++++++--
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/e2e/config/host.docker.internal/zitadel.yaml b/e2e/config/host.docker.internal/zitadel.yaml
index cb7e985be1..203dd16437 100644
--- a/e2e/config/host.docker.internal/zitadel.yaml
+++ b/e2e/config/host.docker.internal/zitadel.yaml
@@ -5,12 +5,23 @@ ExternalDomain: host.docker.internal
 ExternalSecure: false
 
 Database:
-  cockroach:
+  postgres:
     # This makes the e2e config reusable with an out-of-docker zitadel process and an /etc/hosts entry
-    Host:  host.docker.internal
-    EventPushConnRatio: 0.2
+    Host: host.docker.internal
+    Port: 5432
     MaxOpenConns: 15
     MaxIdleConns: 10
+    Database: zitadel
+    User:
+      Username: zitadel
+      Password: zitadel
+      SSL:
+        Mode: disable
+    Admin:
+      Username: postgres
+      Password: postgres
+      SSL:
+        Mode: disable
 
 TLS:
   Enabled: false
diff --git a/e2e/config/localhost/docker-compose.yaml b/e2e/config/localhost/docker-compose.yaml
index 525404938d..41334d92f9 100644
--- a/e2e/config/localhost/docker-compose.yaml
+++ b/e2e/config/localhost/docker-compose.yaml
@@ -30,14 +30,15 @@ services:
 
   db:
     restart: 'always'
-    image: 'cockroachdb/cockroach:latest-v24.3'
-    command: 'start-single-node --insecure --http-addr :9090'
+    image: 'postgres:17-alpine'
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
     healthcheck:
-      test: ['CMD', 'curl', '-f', 'http://localhost:9090/health?ready=1']
+      test: ["CMD-SHELL", "pg_isready", "-d", "zitadel", "-U", "postgres"]
       interval: '10s'
       timeout: '30s'
       retries: 5
       start_period: '20s'
     ports:
-      - "26257:26257"
-      - "9090:9090"
+      - "5432:5432"
diff --git a/e2e/config/localhost/zitadel.yaml b/e2e/config/localhost/zitadel.yaml
index 649f35fa9d..966bb4f6b7 100644
--- a/e2e/config/localhost/zitadel.yaml
+++ b/e2e/config/localhost/zitadel.yaml
@@ -5,12 +5,24 @@ ExternalDomain: localhost
 ExternalSecure: false
 
 Database:
-  cockroach:
+  postgres:
     # This makes the e2e config reusable with an out-of-docker zitadel process and an /etc/hosts entry
     Host: host.docker.internal
-    EventPushConnRatio: 0.2
+    Port: 5432
+    database: zitadel
     MaxOpenConns: 15
     MaxIdleConns: 10
+    Database: zitadel
+    User:
+      Username: zitadel
+      Password: zitadel
+      SSL:
+        Mode: disable
+    Admin:
+      Username: postgres
+      Password: postgres
+      SSL:
+        Mode: disable
 
 TLS:
   Enabled: false