From 4bc7b0a6877987d0351e3ff35677d1ebeb6b50fa Mon Sep 17 00:00:00 2001 From: Iraq Jaber Date: Tue, 25 Mar 2025 15:35:01 +0000 Subject: [PATCH] Revert "replaced cockroach with postgres" This reverts commit 96cf271fb8c271cf49cfef016308451f6c08bc53. --- e2e/config/host.docker.internal/zitadel.yaml | 17 +++-------------- e2e/config/localhost/docker-compose.yaml | 11 +++++------ e2e/config/localhost/zitadel.yaml | 16 ++-------------- 3 files changed, 10 insertions(+), 34 deletions(-) diff --git a/e2e/config/host.docker.internal/zitadel.yaml b/e2e/config/host.docker.internal/zitadel.yaml index 203dd16437..cb7e985be1 100644 --- a/e2e/config/host.docker.internal/zitadel.yaml +++ b/e2e/config/host.docker.internal/zitadel.yaml @@ -5,23 +5,12 @@ ExternalDomain: host.docker.internal ExternalSecure: false Database: - postgres: + cockroach: # This makes the e2e config reusable with an out-of-docker zitadel process and an /etc/hosts entry - Host: host.docker.internal - Port: 5432 + Host: host.docker.internal + EventPushConnRatio: 0.2 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 41334d92f9..525404938d 100644 --- a/e2e/config/localhost/docker-compose.yaml +++ b/e2e/config/localhost/docker-compose.yaml @@ -30,15 +30,14 @@ services: db: restart: 'always' - image: 'postgres:17-alpine' - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres + image: 'cockroachdb/cockroach:latest-v24.3' + command: 'start-single-node --insecure --http-addr :9090' healthcheck: - test: ["CMD-SHELL", "pg_isready", "-d", "zitadel", "-U", "postgres"] + test: ['CMD', 'curl', '-f', 'http://localhost:9090/health?ready=1'] interval: '10s' timeout: '30s' retries: 5 start_period: '20s' ports: - - "5432:5432" + - "26257:26257" + - "9090:9090" diff --git a/e2e/config/localhost/zitadel.yaml b/e2e/config/localhost/zitadel.yaml index 966bb4f6b7..649f35fa9d 100644 --- a/e2e/config/localhost/zitadel.yaml +++ b/e2e/config/localhost/zitadel.yaml @@ -5,24 +5,12 @@ ExternalDomain: localhost ExternalSecure: false Database: - postgres: + cockroach: # This makes the e2e config reusable with an out-of-docker zitadel process and an /etc/hosts entry Host: host.docker.internal - Port: 5432 - database: zitadel + EventPushConnRatio: 0.2 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