working setup where DIDs can be found through discovery (admin)

README.md

@@ -99,6 +99,14 @@ CSS framework is https://tailwindcss.com
 
 ## WIP: complete docker compose setup with 2 instances
 
+# Nodes need to find each other by external URL because they need to resolve the web:did
+Solution: handout 172.17.0.2 to loadbalancer
+Set default range to:
+networks:
+    default:
+        ipam:
+            config:
+                - subnet: 172.17.0.0/16
 ### After clone
 
 - execute `./generate.sh` in `docker-compose/lb/tls/`
@@ -111,7 +119,8 @@ CSS framework is https://tailwindcss.com
 - issue an NutsOrganizationCredential for this DID from this DID
 - use https://admin.right.local and add did:web:right.local:iam:right
 - issue an NutsOrganizationCredential for this DID from this DID
-- add did: `docker exec nuts-demo-ehr-node-right-1 curl --location 'localhost:8081/internal/vdr/v2/did' --header 'Content-Type: application/json' --data '{"tenant": "right"}'`
+- enable services
+- wait
 
 ### Run
 - docker compose up

docker-compose.yml

@@ -9,6 +9,9 @@ services:
       - admin-right
       - demo-left
       - demo-right
+    networks:
+      demo:
+        ipv4_address: 172.90.10.2
     ports:
       - 80:80
       - 443:443
@@ -19,54 +22,98 @@ services:
     image: nutsfoundation/nuts-node:master
     environment:
       NUTS_CONFIGFILE: /nuts/nuts.yaml
+    extra_hosts:
+      - "left.local:172.90.10.2"
+      - "node.left.local:172.90.10.2"
+      - "right.local:172.90.10.2"
+      - "node.right.local:172.90.10.2"
+    networks:
+      demo:
+        ipv4_address: 172.90.10.3
     volumes:
       - "./docker-compose/left/config/node/nuts.yaml:/nuts/nuts.yaml"
       - "./docker-compose/left/data/node:/nuts/data"
       - "./docker-compose/left/config/node/policies:/nuts/policies"
       - "./docker-compose/left/config/node/discovery:/nuts/discovery"
+      - "./docker-compose/lb/tls/ca.pem:/etc/ssl/certs/demo_ca.pem"
   node-right:
     <<: *node
+    networks:
+      demo:
+        ipv4_address: 172.90.10.4
     volumes:
       - "./docker-compose/right/config/node/nuts.yaml:/nuts/nuts.yaml"
       - "./docker-compose/right/data/node:/nuts/data"
       - "./docker-compose/right/config/node/policies:/nuts/policies"
       - "./docker-compose/right/config/node/discovery:/nuts/discovery"
+      - "./docker-compose/lb/tls/ca.pem:/etc/ssl/certs/demo_ca.pem"
   admin-left: &admin
     image: nutsfoundation/nuts-admin:main
     environment:
       NUTS_NODE_ADDRESS: http://node-left:8081
+    networks:
+      demo:
+        ipv4_address: 172.90.10.5
   admin-right:
     <<: *admin
     environment:
       NUTS_NODE_ADDRESS: http://node-right:8081
+    networks:
+      demo:
+        ipv4_address: 172.90.10.6
   demo-left: &demo
     image: nutsfoundation/nuts-demo-ehr:main
     volumes:
       - "./docker-compose/left/config/demo/server.config.yaml:/app/server.config.yaml"
       - "./docker-compose/left/config/demo/customers.json:/app/customers.json"
       - "./docker-compose/left/data/demo:/app/data"
+      - "./docker-compose/lb/tls/ca.pem:/etc/ssl/certs/demo_ca.pem"
     depends_on:
       - hapi-left
-      - node-right
+      - node-left
+    extra_hosts:
+      - "left.local:172.90.10.2"
+      - "node.left.local:172.90.10.2"
+      - "right.local:172.90.10.2"
+      - "node.right.local:172.90.10.2"
+    networks:
+      demo:
+        ipv4_address: 172.90.10.7
   demo-right:
     <<: *demo
     volumes:
       - "./docker-compose/right/config/demo/server.config.yaml:/app/server.config.yaml"
       - "./docker-compose/right/config/demo/customers.json:/app/customers.json"
       - "./docker-compose/right/data/demo:/app/data"
+      - "./docker-compose/lb/tls/ca.pem:/etc/ssl/certs/demo_ca.pem"
     depends_on:
       - hapi-right
       - node-right
+    networks:
+      demo:
+        ipv4_address: 172.90.10.8
   hapi-left: &hapi
     image: hapiproject/hapi:v5.5.2
     environment:
       hapi.fhir.fhir_version: DSTU3
       hapi.fhir.partitioning.allow_references_across_partitions: "false"
     expose:
       - 8080
+    networks:
+      demo:
+        ipv4_address: 172.90.10.9
     volumes:
       - "./docker-compose/left/data/hapi:/usr/local/tomcat/target"
   hapi-right:
     <<: *hapi
+    networks:
+      demo:
+        ipv4_address: 172.90.10.10
     volumes:
       - "./docker-compose/right/data/hapi:/usr/local/tomcat/target"
+networks:
+  demo:
+    ipam:
+      config:
+        - subnet: 172.90.0.0/16
+          ip_range: 172.90.10.0/24

docker-compose/left/data/node/crypto/did:web:node.left.local:iam:left#0_private.pem

@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgQArZvIL6cGeVKX7h
-Lmpw5XA41fjstNDjF2Ci/Ds3ubWhRANCAASikB7PnHQKUlxCGonAjDhRcXWfoY43
-7c0DHd6TlOtmwb9tlanVSuDjm0maTrOSI484tX1eLHhDsIaiFcM2FM6R
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgv9bQhmg6TP2ls3Mo
+xmCZFwYh85JUZENXUg1sVeZcEUShRANCAAQXXWAqzyIe/Vu6K1cRz8DQ6QWTYTiW
+54MCC2JE+Upy6tgG12ij+/7biEsIfBszbKaYQwiVtBPzE406Eyrzi759
 -----END PRIVATE KEY-----

docker-compose/right/data/node/crypto/did:web:node.right.local:iam:right#0_private.pem

@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgIaO+ReIbuVXpoc09
-w2EwTpnvsitcBy6kr7b8VvgTxEShRANCAATCEOApVk2OrSYb6s2SBg935mWx1al5
-LibDFO6xKpA/9QhUAMFSLYL8iqtJeeVuxA5da8xYAEPvZNFoRuScFVvV
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgYPWPI/6GneZO+oz4
+uWqSZaBiGCW+i3OiJ7HAfP4bZPKhRANCAATNt8IsbxfA0MHSPy3MgEo6mFzPUTiz
+LS4lcNM4QO9tbimEQa4tAQJm5rRLX4LO7nBoysLcFeputgnYOyLitiMH
 -----END PRIVATE KEY-----