fix: Adding localhost environment variable in run.sh script for local…

… development (#728)

Signed-off-by: Francisco Javier Ribó <[email protected]>

.github/workflows/e2e-tests.yml

@@ -69,6 +69,7 @@ jobs:
           DEFAULT_WALLET_ENABLED: "false"
           API_KEY_AUTO_PROVISIONING: "false"
           API_KEY_ENABLED: "true"
+          DOCKERHOST: "host.docker.internal"
         uses: isbang/[email protected]
         with:
           compose-file: "./infrastructure/shared/docker-compose-demo.yml"
@@ -85,6 +86,7 @@ jobs:
           DEFAULT_WALLET_AUTH_API_KEY: default
           API_KEY_AUTO_PROVISIONING: false
           API_KEY_ENABLED: true
+          DOCKERHOST: "host.docker.internal"
         uses: isbang/[email protected]
         with:
           compose-file: "./infrastructure/shared/docker-compose-demo.yml"

infrastructure/local/run.sh

@@ -45,6 +45,11 @@ while [[ $# -gt 0 ]]; do
 		WAIT="--wait"
 		shift # past argument
 		;;
+	-d | --dockerhost)
+		DOCKERHOST="$2"
+		shift # past argument
+		shift # past value
+		;;
 	-e | --env)
 		ENV_FILE="$2"
 		shift # past argument
@@ -96,13 +101,15 @@ NAME="${NAME:=local}"
 PORT="${PORT:=80}"
 ENV_FILE="${ENV_FILE:=${SCRIPT_DIR}/.env}"
 NETWORK="${NETWORK:=${NAME}-prism}"
+DOCKERHOST="${DOCKERHOST:=host.docker.internal}"
 
 echo "NAME                   = ${NAME}"
 echo "PORT                   = ${PORT}"
 echo "ENV_FILE               = ${ENV_FILE}"
 echo "NETWORK                = ${NETWORK}"
 echo "GLOBAL_WEBHOOK_URL     = ${GLOBAL_WEBHOOK_URL}"
 echo "GLOBAL_WEBHOOK_API_KEY = ${GLOBAL_WEBHOOK_API_KEY}"
+echo "DOCKERHOST = ${DOCKERHOST}"
 
 echo "--------------------------------------"
 echo "Starting stack using docker compose"
@@ -116,7 +123,7 @@ if [ -n "$GLOBAL_WEBHOOK_API_KEY" ]; then
 	export GLOBAL_WEBHOOK_API_KEY=${GLOBAL_WEBHOOK_API_KEY}
 fi
 
-PORT=${PORT} NETWORK=${NETWORK} docker compose \
+PORT=${PORT} NETWORK=${NETWORK} DOCKERHOST=${DOCKERHOST} docker compose \
 	-p ${NAME} \
 	-f ${SCRIPT_DIR}/../shared/docker-compose.yml \
 	--env-file ${ENV_FILE} ${DEBUG} up ${BACKGROUND} ${WAIT}

infrastructure/shared/apisix/conf/apisix.yaml

@@ -1,5 +1,6 @@
 plugins:
   - name: proxy-rewrite
+  - name: cors
 
 routes:
   - uri: /prism-agent/*
@@ -15,6 +16,8 @@ routes:
   - uri: /didcomm*
     upstream_id: 3
     plugins:
+      cors:
+        allow_origins: "*"
       proxy-rewrite:
         regex_uri: ["^/didcomm(.*)", "/$1"]
   - uri: /apidocs/*

infrastructure/shared/docker-compose-demo.yml

@@ -30,7 +30,7 @@ services:
   prism-agent:
     image: ghcr.io/input-output-hk/prism-agent:${PRISM_AGENT_VERSION}
     environment:
-      DIDCOMM_SERVICE_URL: http://host.docker.internal:${PORT}/didcomm
+      DIDCOMM_SERVICE_URL: http://${DOCKERHOST}:${PORT}/didcomm
       PRISM_NODE_HOST: prism-node
       PRISM_NODE_PORT: 50053
       SECRET_STORAGE_BACKEND: postgres

infrastructure/shared/docker-compose.yml

@@ -92,7 +92,7 @@ services:
       AGENT_DB_NAME: agent
       AGENT_DB_USER: postgres
       AGENT_DB_PASSWORD: postgres
-      DIDCOMM_SERVICE_URL: http://host.docker.internal:${PORT}/didcomm
+      DIDCOMM_SERVICE_URL: http://${DOCKERHOST}:${PORT}/didcomm
       PRISM_NODE_HOST: prism-node
       PRISM_NODE_PORT: 50053
       VAULT_ADDR: ${VAULT_ADDR:-http://vault-server:8200}