TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-04-21 08:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass created e2e sa key

Browse Source
This commit is contained in:
Elio Bischof 2022-07-25 15:51:33 +02:00
parent e3942a0d9e
commit a3fb6dba12
No known key found for this signature in database
GPG Key ID: 7B383FDE4DDBF1BD
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/compose.env
View File

@ -5,7 +5,7 @@ ZITADEL_E2E_ORGOWNERVIEWERPW=Password1!
ZITADEL_E2E_ORGPROJECTCREATORPW=Password1! ZITADEL_E2E_ORGPROJECTCREATORPW=Password1!
ZITADEL_E2E_PASSWORDCOMPLEXITYUSERPW=Password1! ZITADEL_E2E_PASSWORDCOMPLEXITYUSERPW=Password1!
ZITADEL_E2E_LOGINPOLICYUSERPW=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_BASEURL="http://zitadel:8080"
ZITADEL_E2E_OTHERZITADELIDPINSTANCE=false ZITADEL_E2E_OTHERZITADELIDPINSTANCE=false
ZITADEL_EXTERNALDOMAIN=zitadel ZITADEL_EXTERNALDOMAIN=zitadel

17
e2e/docker-compose-overwrite.yaml
View File

@ -16,14 +16,15 @@ services:
- ./compose.env - ./compose.env
environment: environment:
ZITADEL_DATABASE_HOST: db ZITADEL_DATABASE_HOST: db
networks:
- 'zitadel'
volumes:
- ${PWD}/.keys/e2e.json:/.keys/e2e.json
depends_on: depends_on:
zitadel: zitadel:
condition: service_started
networks:
- 'zitadel'
# TODO: See PR #3816 # TODO: See PR #3816
# condition: 'service_healthy' # condition: 'service_healthy'
condition: service_started
e2e: e2e:
image: cypress/included:10.3.0 image: cypress/included:10.3.0
#build: ./e2e #build: ./e2e
@ -31,7 +32,11 @@ services:
depends_on: depends_on:
e2e-setup: e2e-setup:
condition: 'service_completed_successfully' condition: 'service_completed_successfully'
env_file:
- ./compose.env
command: ./cypress.sh run command: ./cypress.sh run
volumes:
- ${PWD}/.keys/e2e.json:/.keys/e2e.json
# note: inside e2e container, the network allows accessing # note: inside e2e container, the network allows accessing
# "zitadel" host under name "zitadel" # "zitadel" host under name "zitadel"
# so "curl http://web" would return whatever the webserver # so "curl http://web" would return whatever the webserver
@ -50,6 +55,6 @@ services:
# rebuild required). # rebuild required).
working_dir: /e2e working_dir: /e2e
volumes: volumes:
- ./console:/e2e - ./console:/e2e
networks: networks:
- 'zitadel' - 'zitadel'