Create a seperate compose file for IPv8

discipl · Jun 5, 2020 · b09fa81 · b09fa81
1 parent 57f3eac
commit b09fa81
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,12 @@ Alternatively, you can use an offline mock, which replicates the NLX environment
 
 The clerk frontend will be available at `https://localhost:443`
 
+### Running with IPv8
+Optionally IPv8 attestation can be used in extend with Ephemeral. This is done as follows:
+
+1. Create (or edit) the config files that are used by the application. These are located in `clerk-frontend/public` and `waardepapieren-service/configuration`. Set the `ENABLE_IPV8_ATTESTATION` to `true`
+2. Run `docker-compose -f docker-compose-travis.yml -f docker-compose-ipv8.yml up`
+
 # Running validator
 The validator app is made with [Expo](https://expo.io/), which is a free and open-source react-native framework for mobile development. to run this on a mobile device, the expo-cli tool is required. to install this, run:
 ```bash

diff --git a/clerk-frontend/public/clerk-frontend-config.json b/clerk-frontend/public/clerk-frontend-config.json
@@ -4,7 +4,7 @@
   "DEFAULT_EPHEMERAL_WEBSOCKET_ENDPOINT" : "ws://localhost:3233",
   "DEFAULT_CERTIFICATE_URL": "http://10.10.5.75:3000/certs/org.crt",
   "SOURCE_ARGUMENT" : "BSN",
-  "ENABLE_IPV8_ATTESTATION": true,
+  "ENABLE_IPV8_ATTESTATION": false,
   "IPV8_SERVICE_DID": "did:discipl:ipv8:TGliTmFDTFBLOs9RF8NUdlFdHcJaSZlNH4F0vuwSB3epF8s8ns1NcB4fWcKSQcuWuqj3C/RQIk3fEEwSwpodkfNmJW54loFalTI=",
   "IPV8_SITE_DID": "did:discipl:ipv8:TGliTmFDTFBLOpd7y5Yd9NDKxelDmsACx9I6Go2cK4v8fKBIKzp0KiEjStqcAfSHFfk7KkqbUodAH0iX3nljnd7Y+bj8b0oFUCI=",
   "IPV8_APP_DID": "did:discipl:ipv8:TGliTmFDTFBLOnj5S5VTowiIEV3QELnWusYPUBoiJ4vXtjeznhUUHdF6CbkMsP7H4PZwESO4LPHByqZHyEkjnM986nRQ2Bit76U=",

diff --git a/docker-compose-ipv8.yml b/docker-compose-ipv8.yml
@@ -0,0 +1,14 @@
+version: '3.5'
+services:
+  ipv8:
+    build:
+      context: ipv8/.
+    ports:
+      - 14410:14410
+      - 14411:14411
+      - 14412:14412
+
+networks:
+  default:
+    external:
+      name: waardepapieren
diff --git a/docker-compose-travis.yml b/docker-compose-travis.yml
@@ -6,63 +6,46 @@ services:
       - ./waardepapieren-service/system-test/ephemeral-certs:/ephemeral-certs:ro
       - ./waardepapieren-service/configuration/:/app/configuration:ro
     build: waardepapieren-service/.
-    depends_on:
-      - ipv8
-    networks:
-      - waardepapieren
     ports:
       - 3232:3232
       - 3233:3233
     environment:
       - WAARDEPAPIEREN_CONFIG=/app/configuration/waardepapieren-config-compose-travis.json
       # Ignore self-signed ephemeral cert issues
       - NODE_TLS_REJECT_UNAUTHORIZED=0
+
   waardepapieren-verblijfplaatshistorie-service:
     volumes:
       - ./waardepapieren-service/system-test/certs:/certs:ro
       - ./waardepapieren-service/system-test/ephemeral-certs:/ephemeral-certs:ro
       - ./waardepapieren-service/configuration/:/app/configuration:ro
     build: waardepapieren-service/.
-    networks:
-      - waardepapieren
     environment:
       - WAARDEPAPIEREN_CONFIG=/app/configuration/waardepapieren-verblijfplaatshistorie-config-compose-travis.json
       # Ignore self-signed ephemeral cert issues
       - NODE_TLS_REJECT_UNAUTHORIZED=0
+
   clerk-frontend:
     build:
       context: clerk-frontend/
       args:
         - CERTIFICATE_HOST=http://$CERT_HOST_IP:8880
         - IPV8_HOST=http://$CERT_HOST_IP
     depends_on:
-      - ipv8
       - waardepapieren-service
-    networks:
-      - waardepapieren
     ports:
       - 443:443
       - 8880:8880
     healthcheck:
       test: service nginx status
     volumes:
       - ./clerk-frontend/nginx/certs:/etc/nginx/certs:ro
+
   mock-nlx:
     build: mock-nlx/
-    networks:
-      - waardepapieren
     ports:
       - 80:80
-  ipv8:
-    build:
-      context: ipv8/.
-    networks:
-      - waardepapieren
-    ports:
-      - 14410:14410
-      - 14411:14411
-      - 14412:14412
 
 networks:
-  waardepapieren:
-    name: waardepapieren
+  default:
+    name: waardepapieren
diff --git a/waardepapieren-service/configuration/waardepapieren-config-compose-travis.json b/waardepapieren-service/configuration/waardepapieren-config-compose-travis.json
@@ -22,7 +22,7 @@
     {"Geslachtsnaam" : "_embedded.ingeschrevenpersonen[0].naam.geslachtsnaam"},
     {"Woonplaats verblijfadres" : "_embedded.ingeschrevenpersonen[0].verblijfplaats.gemeenteVanInschrijving.omschrijving"}
   ],
-  "ENABLE_IPV8_ATTESTATION": true,
+  "ENABLE_IPV8_ATTESTATION": false,
   "IPV8_SERVICE_DID": "did:discipl:ipv8:TGliTmFDTFBLOs9RF8NUdlFdHcJaSZlNH4F0vuwSB3epF8s8ns1NcB4fWcKSQcuWuqj3C/RQIk3fEEwSwpodkfNmJW54loFalTI=",
   "IPV8_SITE_DID": "did:discipl:ipv8:TGliTmFDTFBLOpd7y5Yd9NDKxelDmsACx9I6Go2cK4v8fKBIKzp0KiEjStqcAfSHFfk7KkqbUodAH0iX3nljnd7Y+bj8b0oFUCI=",
   "IPV8_APP_DID": "did:discipl:ipv8:TGliTmFDTFBLOnj5S5VTowiIEV3QELnWusYPUBoiJ4vXtjeznhUUHdF6CbkMsP7H4PZwESO4LPHByqZHyEkjnM986nRQ2Bit76U="

diff --git a/waardepapieren-service/configuration/waardepapieren-config-compose.json b/waardepapieren-service/configuration/waardepapieren-config-compose.json
@@ -21,6 +21,5 @@
     {"Voorletters" : "_embedded.ingeschrevenpersonen[0].naam.voorletters"},
     {"Geslachtsnaam" : "_embedded.ingeschrevenpersonen[0].naam.geslachtsnaam"},
     {"Woonplaats verblijfadres" : "_embedded.ingeschrevenpersonen[0].verblijfplaats.gemeenteVanInschrijving.omschrijving"}
-  ],
-  "ENABLE_IPV8_ATTESTATION": false
+  ]
 }