From 81ae1c6993b4f706d6757c941ad1c7dce9fb6bfb Mon Sep 17 00:00:00 2001 From: David Poltorak Date: Thu, 12 Oct 2023 14:40:41 +0100 Subject: [PATCH] fix: interpolation for local docker-compose on unix Signed-off-by: David Poltorak --- .github/workflows/performance-tests.yml | 19 +++++++++++++++++++ infrastructure/shared/docker-compose.yml | 4 ++-- .../single-tenant-testing-stack/.env | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/performance-tests.yml b/.github/workflows/performance-tests.yml index a0bc1e88db..b531a84fe6 100644 --- a/.github/workflows/performance-tests.yml +++ b/.github/workflows/performance-tests.yml @@ -63,6 +63,7 @@ jobs: API_KEY_AUTO_PROVISIONING: false API_KEY_ENABLED: true DOCKERHOST: "host.docker.internal" + PG_PORT: 5432 uses: isbang/compose-action@v1.4.1 with: compose-file: "./infrastructure/shared/docker-compose.yml" @@ -79,6 +80,7 @@ jobs: API_KEY_AUTO_PROVISIONING: false API_KEY_ENABLED: true DOCKERHOST: "host.docker.internal" + PG_PORT: 5433 uses: isbang/compose-action@v1.4.1 with: compose-file: "./infrastructure/shared/docker-compose.yml" @@ -86,6 +88,23 @@ jobs: up-flags: "--wait" down-flags: "--volumes" + - name: Start services for verifier + env: + PORT: 8100 + ADMIN_TOKEN: admin + DEFAULT_WALLET_ENABLED: true + DEFAULT_WALLET_AUTH_API_KEY: default + API_KEY_AUTO_PROVISIONING: false + API_KEY_ENABLED: true + DOCKERHOST: "host.docker.internal" + PG_PORT: 5434 + uses: isbang/compose-action@v1.4.1 + with: + compose-file: "./infrastructure/shared/docker-compose.yml" + compose-flags: "--env-file ./infrastructure/local/.env -p verifier" + up-flags: "--wait" + down-flags: "--volumes" + - name: Setup Node.js uses: actions/setup-node@v3 with: diff --git a/infrastructure/shared/docker-compose.yml b/infrastructure/shared/docker-compose.yml index 20888a3229..7c2f335096 100644 --- a/infrastructure/shared/docker-compose.yml +++ b/infrastructure/shared/docker-compose.yml @@ -92,8 +92,8 @@ services: AGENT_DB_NAME: agent AGENT_DB_USER: postgres AGENT_DB_PASSWORD: postgres - DIDCOMM_SERVICE_URL: ${DIDCOMM_SERVICE_URL:-http://${DOCKERHOST}:${PORT}/didcomm} - REST_SERVICE_URL: ${REST_SERVICE_URL:-http://${DOCKERHOST}:${PORT}/prism-agent} + DIDCOMM_SERVICE_URL: http://${DOCKERHOST}:${PORT}/didcomm + REST_SERVICE_URL: http://${DOCKERHOST}:${PORT}/didcomm PRISM_NODE_HOST: prism-node PRISM_NODE_PORT: 50053 VAULT_ADDR: ${VAULT_ADDR:-http://vault-server:8200} diff --git a/infrastructure/single-tenant-testing-stack/.env b/infrastructure/single-tenant-testing-stack/.env index 00710460b2..333904bbd4 100644 --- a/infrastructure/single-tenant-testing-stack/.env +++ b/infrastructure/single-tenant-testing-stack/.env @@ -1,3 +1,3 @@ -PRISM_AGENT_VERSION=1.16.0 +PRISM_AGENT_VERSION=1.16.4 PRISM_NODE_VERSION=2.2.1 VAULT_DEV_ROOT_TOKEN_ID=root