fix: interpolation for local docker-compose on unix

Signed-off-by: David Poltorak <[email protected]>
hyperledger · Oct 12, 2023 · 81ae1c6 · 81ae1c6
1 parent d76171e
commit 81ae1c6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git 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/[email protected]
         with:
           compose-file: "./infrastructure/shared/docker-compose.yml"
@@ -79,13 +80,31 @@ jobs:
           API_KEY_AUTO_PROVISIONING: false
           API_KEY_ENABLED: true
           DOCKERHOST: "host.docker.internal"
+          PG_PORT: 5433
         uses: isbang/[email protected]
         with:
           compose-file: "./infrastructure/shared/docker-compose.yml"
           compose-flags: "--env-file ./infrastructure/local/.env -p holder"
           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/[email protected]
+        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
@@ -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
@@ -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