fix project root

This commit is contained in:
Elio Bischof 2022-07-20 13:08:35 +02:00
parent f3697b14f4
commit b951179ac5
No known key found for this signature in database
GPG Key ID: 7B383FDE4DDBF1BD
3 changed files with 4 additions and 2 deletions

View File

@ -6,7 +6,7 @@ ENVFILE=$2
shift
shift
projectRoot=".."
export projectRoot=".."
set -a; source $ENVFILE; set +a

View File

@ -1,3 +1,3 @@
#!/bin/bash
COMPOSE_DOCKER_CLI_BUILD=1 docker compose --file ./docs/docs/guides/installation/run/docker-compose.yaml --file ./e2e/docker-compose-overwrite.yaml "$@"
COMPOSE_DOCKER_CLI_BUILD=1 docker compose --file ${projectRoot}/docs/docs/guides/installation/run/docker-compose.yaml --file ${projectRoot}/e2e/docker-compose-overwrite.yaml "$@"

View File

@ -11,3 +11,5 @@ ZITADEL_E2E_APIURL="http://localhost:8080"
ZITADEL_E2E_ACCOUNTSURL="http://localhost:8080"
ZITADEL_E2E_ISSUERURL="http://localhost:8080/oauth/v2"
ZITADEL_E2E_OTHERZITADELIDPINSTANCE=false
ZITADEL_E2E_ZITADELPROJECTRESOURCEID="bignumber-$(echo -n $(${projectRoot}/e2e/docker-compose.sh exec --no-TTY db cockroach sql --database zitadel --insecure --execute "select aggregate_id from eventstore.events where event_type = 'project.added' and event_data = '{\"name\": \"ZITADEL\"}';" --format tsv) | cut -d " " -f 2)"
ZITADEL_E2E_INSTANCEID="$(echo -n $(${projectRoot}/e2e/docker-compose.sh exec --no-TTY db cockroach sql --database zitadel --insecure --execute "select aggregate_id from eventstore.events where event_type = 'instance.added' and event_data = '{\"name\": \"Localhost\"}';" --format tsv) | cut -d " " -f 2)"