Reverting development demo configs

thiagoromanos · thiagoromanos · commit f5e8f4745ebb · 2024-10-07T08:13:34.000-03:00
diff --git a/demo/playground/Dockerfile.acapy b/demo/playground/Dockerfile.acapy
@@ -1,4 +1,4 @@
-FROM acapy-local
+FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.4
 
 USER root
 
diff --git a/demo/playground/configs/multitenant-auto-accept.yml b/demo/playground/configs/multitenant-auto-accept.yml
@@ -3,27 +3,8 @@ debug-connections: true
 auto-accept-invites: true
 auto-accept-requests: true
 auto-ping-connection: true
-monitor-ping: true
-supress-healthcheck-log: true
 
 # multitenant
 multitenant: true
 multitenant-admin: true
-jwt-secret: changeme
-
-tails-server-base-url: http://gcpdevssiag.aquarius.cpqd.com.br/indy-tails-server-new
-# besu-provider-url: http://10.202.77.68:21006
-# account-address: "0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73"
-# private-account-key: "0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"
-# schema-contract-address: "0x6073e9c8702975dcbe1736e0921ce748f99bd20e"
-# indy-did-contract-address: "0x4DEF1dfA07d1C68B0282F323B268E9d26418E776"
-# credef-contract-address: "0xAB1d436A6f97f7A0B08CEb700Dae0903Ee6f314B"
-# revocation-contract-address: "0x4245CF4518CB2C280f5e9c6a03c90C147F80B4d9"
-# besu-provider-url: http://192.168.15.74:8545
-besu-provider-url: http://rpcnode:8545
-account-address: "0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73"
-private-account-key: "0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"
-schema-contract-address: "0x0000000000000000000000000000000000005555"
-indy-did-contract-address: "0x0000000000000000000000000000000000003333"
-credef-contract-address: "0x0000000000000000000000000000000000004444"
-revocation-contract-address: "0x0000000000000000000000000000000000017777"
+jwt-secret: changeme
diff --git a/demo/playground/configs/singletenant-auto-accept.yml b/demo/playground/configs/singletenant-auto-accept.yml
@@ -2,48 +2,4 @@
 debug-connections: true
 auto-accept-invites: true
 auto-accept-requests: true
-auto-ping-connection: true
-monitor-ping: true
-public-invites: true
-supress-healthcheck-log: true
-
-# cpqd agents configs
-auto-respond-credential-offer: false
-auto-respond-credential-proposal: false
-auto-respond-credential-request: true
-auto-respond-messages: true
-auto-respond-presentation-proposal: false
-auto-respond-presentation-request: false
-auto-verify-presentation: true
-debug-webhooks: true
-emit-new-didcomm-mime-type: true
-emit-new-didcomm-prefix: true
-preserve-exchange-records: true
-
-# revocation configs
-notify-revocation: true
-monitor-revocation-notification: true
-
-
-tails-server-base-url: http://tails-server:6543
-
-# genesis-url: http://webserver:8000/genesis
-
-# besu-provider-url: http://10.202.77.68:21006
-# account-address: 0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73
-# schema-contract-address: 0x6073e9c8702975dcbe1736e0921ce748f99bd20e
-# private-account-key: 0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63
-# credef-contract-address: 0xAB1d436A6f97f7A0B08CEb700Dae0903Ee6f314B
-# revocation-contract-address: 0x4245CF4518CB2C280f5e9c6a03c90C147F80B4d9
-# indy-did-contract-address: 0x4DEF1dfA07d1C68B0282F323B268E9d26418E776
-
-besu-provider-url: http://rpcnode:8545
-account-address: "0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73"
-private-account-key: "0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"
-schema-contract-address: "0x0000000000000000000000000000000000005555"
-indy-did-contract-address: "0x0000000000000000000000000000000000003333"
-credef-contract-address: "0x0000000000000000000000000000000000004444"
-revocation-contract-address: "0x0000000000000000000000000000000000017777"
-revocation-list-gas-limit: 0x1fffffffffffff
-
-# drop database "hub-holder-askar-wallet";   drop user hub_holder_acapy; drop database "hub-issuer-askar-wallet";   drop user hub_issuer_acapy; drop database "hub-verifier-askar-wallet"; drop user hub_verifier_acapy; 
+auto-ping-connection: true
diff --git a/demo/playground/docker-compose.yml b/demo/playground/docker-compose.yml
@@ -5,7 +5,7 @@
 # If you want to delete your wallet data just run `docker volume ls -q | xargs docker volume rm`
 #
 # If you want to enable tracing, see elk-stack. Ensure elk-stack is running, uncomment the ACAPY_TRACE environment variables and run `docker compose up`
-# version: "3"
+version: "3"
 
 
 networks:
@@ -17,74 +17,71 @@ networks:
      name: ${ELK_NETWORK_NAME:-elknet}
      driver: bridge
      external: true
-  
 
 services:
-  # ngrok-faber-alice:
-  #   image: ngrok/ngrok:latest
-  #   restart: unless-stopped
-  #   hostname: ${NGROK_FABER_ALICE_HOST}
-  #   environment:
-  #     - NGROK_AUTHTOKEN=${NGROK_AUTHTOKEN:-}
-  #   command:
-  #     - "start"
-  #     - "--all"
-  #     - "--config"
-  #     - "/etc/ngrok.yml"
-  #   volumes:
-  #     - ./ngrok-faber-alice.yml:/etc/ngrok.yml
-  #   networks:
-  #     - app-network
-  #   # ports:
-  #   #   - 4040:4040
-  #   healthcheck:
-  #     test: /bin/bash -c "</dev/tcp/${NGROK_FABER_ALICE_HOST}/4040"
-  #     interval: 3s
-  #     timeout: 3s
-  #     start_period: 5s
-  #     retries: 5
+  ngrok-faber-alice:
+    image: ngrok/ngrok:latest
+    restart: unless-stopped
+    hostname: ${NGROK_FABER_ALICE_HOST}
+    environment:
+      - NGROK_AUTHTOKEN=${NGROK_AUTHTOKEN:-}
+    command:
+      - "start"
+      - "--all"
+      - "--config"
+      - "/etc/ngrok.yml"
+    volumes:
+      - ./ngrok-faber-alice.yml:/etc/ngrok.yml
+    networks:
+      - app-network
+    # ports:
+    #   - 4040:4040
+    healthcheck:
+      test: /bin/bash -c "</dev/tcp/${NGROK_FABER_ALICE_HOST}/4040"
+      interval: 3s
+      timeout: 3s
+      start_period: 5s
+      retries: 5
 
-  # ngrok-acme-multi:
-  #   image: ngrok/ngrok:latest
-  #   restart: unless-stopped
-  #   hostname: ${NGROK_ACME_MULTI_HOST}
-  #   environment:
-  #     - NGROK_AUTHTOKEN=${NGROK_AUTHTOKEN:-}
-  #   command:
-  #     - "start"
-  #     - "--all"
-  #     - "--config"
-  #     - "/etc/ngrok.yml"
-  #   volumes:
-  #     - ./ngrok-acme-multi.yml:/etc/ngrok.yml
-  #   networks:
-  #     - app-network
-  #   # ports:
-  #   #   - 4040:4040
-  #   healthcheck:
-  #     test: /bin/bash -c "</dev/tcp/${NGROK_ACME_MULTI_HOST}/4040"
-  #     interval: 3s
-  #     timeout: 3s
-  #     start_period: 5s
-  #     retries: 5
+  ngrok-acme-multi:
+    image: ngrok/ngrok:latest
+    restart: unless-stopped
+    hostname: ${NGROK_ACME_MULTI_HOST}
+    environment:
+      - NGROK_AUTHTOKEN=${NGROK_AUTHTOKEN:-}
+    command:
+      - "start"
+      - "--all"
+      - "--config"
+      - "/etc/ngrok.yml"
+    volumes:
+      - ./ngrok-acme-multi.yml:/etc/ngrok.yml
+    networks:
+      - app-network
+    # ports:
+    #   - 4040:4040
+    healthcheck:
+      test: /bin/bash -c "</dev/tcp/${NGROK_ACME_MULTI_HOST}/4040"
+      interval: 3s
+      timeout: 3s
+      start_period: 5s
+      retries: 5
 
   faber-agent:
     image: playground-image
     build:
       context: .
       dockerfile: Dockerfile.acapy
     depends_on:
-      tails-server:
-        condition: service_started
       wallet-db:
         condition: service_healthy
-      # ngrok-faber-alice:
-      #   condition: service_healthy
+      ngrok-faber-alice:
+        condition: service_healthy
     restart: unless-stopped    
     hostname: ${FABER_HOST}
     environment:
       - TUNNEL_HOST=${FABER_TUNNEL_HOST}
-      # - TUNNEL_NAME=${FABER_TUNNEL_NAME}
+      - TUNNEL_NAME=${FABER_TUNNEL_NAME}
       - AGENT_LABEL=${FABER_AGENT_LABEL}
       - AGENT_HTTP_IN_PORT=${FABER_AGENT_HTTP_IN_PORT}
       - AGENT_HTTP_ADMIN_PORT=${FABER_AGENT_HTTP_ADMIN_PORT}
@@ -94,16 +91,11 @@ services:
       - ACAPY_WALLET_STORAGE_CREDS=${FABER_ACAPY_WALLET_STORAGE_CREDS}
       - ACAPY_WALLET_NAME=${FABER_ACAPY_WALLET_NAME}
       - ACAPY_WALLET_KEY=${FABER_ACAPY_WALLET_KEY}
-      # - ACAPY_GENESIS_URL=${FABER_ACAPY_GENESIS_URL}
+      - ACAPY_GENESIS_URL=${FABER_ACAPY_GENESIS_URL}
       - ACAPY_LOG_LEVEL=${FABER_ACAPY_LOG_LEVEL}
       - RUST_LOG=${FABER_RUST_LOG}
       - POSTGRESQL_HOST=${FABER_POSTGRESQL_HOST}
       - POSTGRESQL_PORT=${FABER_POSTGRESQL_PORT}
-      - ACAPY_NOTIFY_REVOCATION=true
-      - ACAPY_MONITOR_REVOCATION_NOTIFICATION=true
-      - ACAPY_WEBHOOK_URL=${FABER_ACAPY_WEBHOOK_URL}
-
-      # - ACAPY_WEBHOOK_URL=${FABER_ACAPY_WEBHOOK_URL}
     #   - ACAPY_TRACE=${FABER_ACAPY_TRACE}
     #   - ACAPY_TRACE_TARGET=${FABER_ACAPY_TRACE_TARGET}
     #   - ACAPY_TRACE_TAG=${FABER_ACAPY_TRACE_TAG}
@@ -126,17 +118,15 @@ services:
       context: .
       dockerfile: Dockerfile.acapy
     depends_on:
-      tails-server:
-        condition: service_started
       wallet-db:
         condition: service_healthy
-      # ngrok-faber-alice:
-      #   condition: service_healthy
+      ngrok-faber-alice:
+        condition: service_healthy
     restart: unless-stopped    
     hostname: ${ALICE_HOST}
     environment:
       - TUNNEL_HOST=${ALICE_TUNNEL_HOST}
-      # - TUNNEL_NAME=${ALICE_TUNNEL_NAME}
+      - TUNNEL_NAME=${ALICE_TUNNEL_NAME}
       - AGENT_LABEL=${ALICE_AGENT_LABEL}
       - AGENT_HTTP_IN_PORT=${ALICE_AGENT_HTTP_IN_PORT}
       - AGENT_HTTP_ADMIN_PORT=${ALICE_AGENT_HTTP_ADMIN_PORT}
@@ -146,16 +136,11 @@ services:
       - ACAPY_WALLET_STORAGE_CREDS=${ALICE_ACAPY_WALLET_STORAGE_CREDS}
       - ACAPY_WALLET_NAME=${ALICE_ACAPY_WALLET_NAME}
       - ACAPY_WALLET_KEY=${ALICE_ACAPY_WALLET_KEY}
-      # - ACAPY_GENESIS_URL=${ALICE_ACAPY_GENESIS_URL}
+      - ACAPY_GENESIS_URL=${ALICE_ACAPY_GENESIS_URL}
       - ACAPY_LOG_LEVEL=${ALICE_ACAPY_LOG_LEVEL}
       - RUST_LOG=${ALICE_RUST_LOG}
       - POSTGRESQL_HOST=${ALICE_POSTGRESQL_HOST}
       - POSTGRESQL_PORT=${ALICE_POSTGRESQL_PORT}
-      - ACAPY_NOTIFY_REVOCATION=true
-      - ACAPY_MONITOR_REVOCATION_NOTIFICATION=true
-      - ACAPY_WEBHOOK_URL=${ALICE_ACAPY_WEBHOOK_URL}
-
-      # - ACAPY_WEBHOOK_URL=https://webhook.site/1f72e79c-56c4-4b4f-8759-f007c09a9114
     #   - ACAPY_TRACE=${ALICE_ACAPY_TRACE}
     #   - ACAPY_TRACE_TARGET=${ALICE_ACAPY_TRACE_TARGET}
     #   - ACAPY_TRACE_TAG=${ALICE_ACAPY_TRACE_TAG}
@@ -178,17 +163,15 @@ services:
       context: .
       dockerfile: Dockerfile.acapy
     depends_on:
-      tails-server:
-        condition: service_started
       wallet-db:
         condition: service_healthy
-      # ngrok-acme-multi:
-      #   condition: service_healthy
+      ngrok-acme-multi:
+        condition: service_healthy
     restart: unless-stopped    
     hostname: ${ACME_HOST}
     environment:
       - TUNNEL_HOST=${ACME_TUNNEL_HOST}
-      # - TUNNEL_NAME=${ACME_TUNNEL_NAME}
+      - TUNNEL_NAME=${ACME_TUNNEL_NAME}
       - AGENT_LABEL=${ACME_AGENT_LABEL}
       - AGENT_HTTP_IN_PORT=${ACME_AGENT_HTTP_IN_PORT}
       - AGENT_HTTP_ADMIN_PORT=${ACME_AGENT_HTTP_ADMIN_PORT}
@@ -198,8 +181,7 @@ services:
       - ACAPY_WALLET_STORAGE_CREDS=${ACME_ACAPY_WALLET_STORAGE_CREDS}
       - ACAPY_WALLET_NAME=${ACME_ACAPY_WALLET_NAME}
       - ACAPY_WALLET_KEY=${ACME_ACAPY_WALLET_KEY}
-      # - ACAPY_GENESIS_URL=${ACME_ACAPY_GENESIS_URL}
-      - ACAPY_WEBHOOK_URL=${ACME_ACAPY_WEBHOOK_URL}
+      - ACAPY_GENESIS_URL=${ACME_ACAPY_GENESIS_URL}
       - ACAPY_LOG_LEVEL=${ACME_ACAPY_LOG_LEVEL}
       - RUST_LOG=${ACME_RUST_LOG}
       - POSTGRESQL_HOST=${ACME_POSTGRESQL_HOST}
@@ -221,23 +203,20 @@ services:
       retries: 5
 
   multi-agent:
-    profiles: [multi]
     image: playground-image
     build:
       context: .
       dockerfile: Dockerfile.acapy
     depends_on:
-      tails-server:
-        condition: service_started
       wallet-db:
         condition: service_healthy
-      # ngrok-acme-multi:
-      #   condition: service_healthy
+      ngrok-acme-multi:
+        condition: service_healthy
     restart: unless-stopped    
     hostname: ${MULTI_HOST}
     environment:
       - TUNNEL_HOST=${MULTI_TUNNEL_HOST}
-      # - TUNNEL_NAME=${MULTI_TUNNEL_NAME}
+      - TUNNEL_NAME=${MULTI_TUNNEL_NAME}
       - AGENT_LABEL=${MULTI_AGENT_LABEL}
       - AGENT_HTTP_IN_PORT=${MULTI_AGENT_HTTP_IN_PORT}
       - AGENT_HTTP_ADMIN_PORT=${MULTI_AGENT_HTTP_ADMIN_PORT}
@@ -247,7 +226,7 @@ services:
       - ACAPY_WALLET_STORAGE_CREDS=${MULTI_ACAPY_WALLET_STORAGE_CREDS}
       - ACAPY_WALLET_NAME=${MULTI_ACAPY_WALLET_NAME}
       - ACAPY_WALLET_KEY=${MULTI_ACAPY_WALLET_KEY}
-      # - ACAPY_GENESIS_URL=${MULTI_ACAPY_GENESIS_URL}
+      - ACAPY_GENESIS_URL=${MULTI_ACAPY_GENESIS_URL}
       - ACAPY_LOG_LEVEL=${MULTI_ACAPY_LOG_LEVEL}
       - RUST_LOG=${MULTI_RUST_LOG}
       - POSTGRESQL_HOST=${MULTI_POSTGRESQL_HOST}
@@ -279,28 +258,14 @@ services:
     networks:
       - app-network
     volumes:
-      - wallet-db-data:/var/lib/postgresql/data
+      - wallet-db-data:/var/lib/pgsql/data
       - ./max_conns.sql:/docker-entrypoint-initdb.d/max_conns.sql    
     healthcheck:
       test: pg_isready -U postgres
       interval: 3s
       timeout: 3s
       retries: 5
 
-  tails-server:
-    image: ghcr.io/bcgov/tails-server:1
-    command: >
-      tails-server
-        --host 0.0.0.0
-        --port 6543
-        --storage-path /app/storage
-        --log-level DEBUG
-    networks:
-      - app-network
-    volumes:
-      - tails-file-data:/app/storage
-
 volumes:
   wallet-db-data:
-  tails-file-data:
 
diff --git a/demo/playground/start.sh b/demo/playground/start.sh
@@ -34,7 +34,7 @@ aca-py start \
     --inbound-transport http 0.0.0.0 ${AGENT_HTTP_IN_PORT} \
     --outbound-transport http \
     --emit-new-didcomm-prefix \
-    --wallet-type askar-anoncreds \
+    --wallet-type askar \
     --wallet-storage-type postgres_storage \
     --admin-insecure-mode \
     --admin 0.0.0.0 ${AGENT_HTTP_ADMIN_PORT} \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM acapy-local`
	`1`	`+FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.4`
`2`	`2`
`3`	`3`	`USER root`
`4`	`4`