From a3fb6dba1262b7dd84daba2dedc69cceeab15f07 Mon Sep 17 00:00:00 2001
From: Elio Bischof <eliobischof@gmail.com>
Date: Mon, 25 Jul 2022 15:51:33 +0200
Subject: [PATCH] pass created e2e sa key

---
 e2e/compose.env                   |  2 +-
 e2e/docker-compose-overwrite.yaml | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/e2e/compose.env b/e2e/compose.env
index af809c8cf2..9252e4cc57 100644
--- a/e2e/compose.env
+++ b/e2e/compose.env
@@ -5,7 +5,7 @@ ZITADEL_E2E_ORGOWNERVIEWERPW=Password1!
 ZITADEL_E2E_ORGPROJECTCREATORPW=Password1!
 ZITADEL_E2E_PASSWORDCOMPLEXITYUSERPW=Password1!
 ZITADEL_E2E_LOGINPOLICYUSERPW=Password1!
-ZITADEL_E2E_MACHINEKEYPATH="${projectRoot}/.keys/e2e.json"
+ZITADEL_E2E_MACHINEKEYPATH="/.keys/e2e.json"
 ZITADEL_E2E_BASEURL="http://zitadel:8080"
 ZITADEL_E2E_OTHERZITADELIDPINSTANCE=false
 ZITADEL_EXTERNALDOMAIN=zitadel
diff --git a/e2e/docker-compose-overwrite.yaml b/e2e/docker-compose-overwrite.yaml
index ee5720c091..720e2bbbb9 100644
--- a/e2e/docker-compose-overwrite.yaml
+++ b/e2e/docker-compose-overwrite.yaml
@@ -16,14 +16,15 @@ services:
     - ./compose.env
     environment:
       ZITADEL_DATABASE_HOST: db
+    networks:
+    - 'zitadel'
+    volumes:
+    - ${PWD}/.keys/e2e.json:/.keys/e2e.json
     depends_on:
       zitadel:
-        condition: service_started
-    networks:
-      - 'zitadel'
 #       TODO: See PR #3816
 #       condition: 'service_healthy'
-
+        condition: service_started
   e2e:
     image: cypress/included:10.3.0
     #build: ./e2e
@@ -31,7 +32,11 @@ services:
     depends_on:
       e2e-setup:
         condition: 'service_completed_successfully'
+    env_file:
+    - ./compose.env
     command: ./cypress.sh run
+    volumes:
+    - ${PWD}/.keys/e2e.json:/.keys/e2e.json
     # note: inside e2e container, the network allows accessing
     # "zitadel" host under name "zitadel"
     # so "curl http://web" would return whatever the webserver
@@ -50,6 +55,6 @@ services:
     #     rebuild required).
     working_dir: /e2e
     volumes:
-      - ./console:/e2e
+    - ./console:/e2e
     networks:
-      - 'zitadel'
+    - 'zitadel'