add postgres db to wallet of multitenant agent

Author: wip-abramson

tutorials/4. Multitenancy/docker-compose.yml

@@ -71,52 +71,70 @@ services:
     ports:
       - ${MEDIATOR_JUPYTER_PORT}:8888
       - ${MEDIATOR_WEBHOOK_PORT}:${MEDIATOR_WEBHOOK_PORT}
-  ngrok-basewallet:
+  wallets-db:
+    image: postgres:11
+    container_name: wallets-db
+    command: postgres -c listen_addresses='*'
+    environment:
+      POSTGRES_PASSWORD: dbpass
+      POSTGRES_USER: postgres
+      POSTGRES_DB: wallets
+    volumes:
+      - ./resources/init.sql:/docker-entrypoint-initdb.d/init.sql
+    networks:
+      - indy_demo
+    tty: true
+  ngrok-multitenant:
     image: wernight/ngrok
-    command: ngrok http basewallet-agent:${BASEWALLET_HTTP_PORT} --log stdout
+    command: ngrok http multitenant-agent:${MULTITENANT_HTTP_PORT} --log stdout
     networks:
       - indy_demo
-  basewallet-agent:
+  multitenant-agent:
     build:
       context: ../../
       dockerfile: dockerfiles/agents/Dockerfile.ngrok
     environment:
-      - NGROK_NAME=ngrok-basewallet
-      - ADMIN_URL=http://basewallet-agent:${BASEWALLET_ADMIN_PORT}
-      - AGENT_NAME=${BASEWALLET_AGENT_NAME}
-      - ADMIN_PORT=${BASEWALLET_ADMIN_PORT}
-      - HTTP_PORT=${BASEWALLET_HTTP_PORT}
-      - WEBHOOK_URL=${BASEWALLET_WEBHOOK_URL}
-      - AGENT_ENDPOINT=${BASEWALLET_AGENT_ENDPOINT}
-      - WALLET_SEED=${BASEWALLET_WALLET_SEED}
-      - WALLET_NAME=${BASEWALLET_WALLET_NAME}
-      - WALLET_KEY=${BASEWALLET_WALLET_KEY}
+      - NGROK_NAME=ngrok-multitenant
+      - ADMIN_URL=http://multitenant-agent:${MULTITENANT_ADMIN_PORT}
+      - AGENT_NAME=${MULTITENANT_AGENT_NAME}
+      - ADMIN_PORT=${MULTITENANT_ADMIN_PORT}
+      - HTTP_PORT=${MULTITENANT_HTTP_PORT}
+      - WEBHOOK_URL=${MULTITENANT_WEBHOOK_URL}
+      - AGENT_ENDPOINT=${MULTITENANT_AGENT_ENDPOINT}
+      - WALLET_SEED=${MULTITENANT_WALLET_SEED}
+      - WALLET_NAME=${MULTITENANT_WALLET_NAME}
+      - WALLET_KEY=${MULTITENANT_WALLET_KEY}
       - WALLET_TYPE=${WALLET_TYPE}
-      - ACAPY_ADMIN_INSECURE_MODE=${BASEWALLET_ADMIN_SECURE}
+      - ACAPY_ADMIN_INSECURE_MODE=${MULTITENANT_ADMIN_SECURE}
       - GENESIS_URL=${GENESIS_URL}
       - ACAPY_MULTITENANT=true
       - ACAPY_MULTITENANT_JWT_SECRET="password"
       - ACAPY_MULTITENANT_ADMIN=true
+      - ACAPY_WALLET_STORAGE_TYPE=postgres_storage
+      - ACAPY_WALLET_STORAGE_CONFIG={"url":"wallets-db:5432","wallet_scheme":"MultiWalletSingleTable"}
+      - ACAPY_WALLET_STORAGE_CREDS={"account":"postgres","password":"dbpass","admin_account":"postgres","admin_password":"dbpass"}
     ports:
-      - ${BASEWALLET_HTTP_PORT}:${BASEWALLET_HTTP_PORT}
-      - ${BASEWALLET_ADMIN_PORT}:${BASEWALLET_ADMIN_PORT}
+      - ${MULTITENANT_HTTP_PORT}:${MULTITENANT_HTTP_PORT}
+      - ${MULTITENANT_ADMIN_PORT}:${MULTITENANT_ADMIN_PORT}
+    depends_on:
+      - wallets-db
     networks:
       - indy_demo
-  basewallet-notebook:
+  multitenant-notebook:
     build:
       context: ../../
       dockerfile: dockerfiles/controllers/Dockerfile.basiccontroller
       args:
-        - jupyter_port=${BASEWALLET_JUPYTER_PORT}
+        - jupyter_port=${MULTITENANT_JUPYTER_PORT}
     depends_on:
-      - basewallet-agent
+      - multitenant-agent
     networks:
       - indy_demo
     volumes:
-      - ./notebooks/basewallet:/workspace
+      - ./notebooks/multitenant:/workspace
     ports:
       - "8888:8888"
-      - ${BASEWALLET_WEBHOOK_PORT}:${BASEWALLET_WEBHOOK_PORT}
+      - ${MULTITENANT_WEBHOOK_PORT}:${MULTITENANT_WEBHOOK_PORT}
   external-notebook:
     build:
       context: ../../
@@ -133,5 +151,7 @@ services:
       - "8889:8888"
       - ${EXTERNAL_WEBHOOK_PORT}:${EXTERNAL_WEBHOOK_PORT}
 
+
+
 networks:
   indy_demo:

tutorials/4. Multitenancy/manage

@@ -62,7 +62,7 @@ EOF
 # -----------------------------------------------------------------------------------------------------------------
 # Default Settings:
 # -----------------------------------------------------------------------------------------------------------------
-DEFAULT_CONTAINERS="ngrok-external external-agent ngrok-basewallet basewallet-agent basewallet-notebook external-notebook ngrok-mediator mediator-agent mediator-notebook "
+DEFAULT_CONTAINERS="ngrok-external external-agent ngrok-multitenant multitenant-agent multitenant-notebook external-notebook ngrok-mediator mediator-agent mediator-notebook wallets-db"
 
 # -----------------------------------------------------------------------------------------------------------------
 # Functions:
@@ -129,18 +129,18 @@ configureEnvironment() {
   export EXTERNAL_JUPYTER_PORT="8889"
   export EXTERNAL_ADMIN_SECURE="true"
 
-  # BASEWALLET-agent
-  export BASEWALLET_AGENT_NAME="BASEWALLET"
-  export BASEWALLET_ADMIN_PORT=8021
-  export BASEWALLET_HTTP_PORT=8020
-  export BASEWALLET_WEBHOOK_PORT=8022
-  export BASEWALLET_WEBHOOK_URL=${BASEWALLET_WEBHOOK_URL:-http://$DOCKERHOST:$BASEWALLET_WEBHOOK_PORT}
-  export BASEWALLET_AGENT_ENDPOINT=${BASEWALLET_AGENT_ENDPOINT:-http://$DOCKERHOST:$BASEWALLET_HTTP_PORT}
-  export BASEWALLET_WALLET_SEED="IAGENT_seed_00000000000000000000"
-  export BASEWALLET_WALLET_KEY="BASEWALLET_key_00000000000000000000000"
-  export BASEWALLET_WALLET_NAME="BASEWALLET Wallet"
-  export BASEWALLET_JUPYTER_PORT="8888"
-  export BASEWALLET_ADMIN_SECURE="true"
+  # MULTITENANT-agent
+  export MULTITENANT_AGENT_NAME="MULTITENANT"
+  export MULTITENANT_ADMIN_PORT=8021
+  export MULTITENANT_HTTP_PORT=8020
+  export MULTITENANT_WEBHOOK_PORT=8022
+  export MULTITENANT_WEBHOOK_URL=${MULTITENANT_WEBHOOK_URL:-http://$DOCKERHOST:$MULTITENANT_WEBHOOK_PORT}
+  export MULTITENANT_AGENT_ENDPOINT=${MULTITENANT_AGENT_ENDPOINT:-http://$DOCKERHOST:$MULTITENANT_HTTP_PORT}
+  export MULTITENANT_WALLET_SEED="IAGENT_seed_00000000000000000000"
+  export MULTITENANT_WALLET_KEY="MULTITENANT_key_00000000000000000000000"
+  export MULTITENANT_WALLET_NAME="MULTITENANT Wallet"
+  export MULTITENANT_JUPYTER_PORT="8888"
+  export MULTITENANT_ADMIN_SECURE="true"
 
     # MEDIATOR-agent
   export MEDIATOR_AGENT_NAME="MEDIATOR"