fix(examples/corda): adds etcd to docker-compose

This was forgotten from the original commit which only updated fabrid and quorum Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
hyperledger-cacti · Nov 28, 2019 · 0f9b886 · 0f9b886
1 parent 8c96ef1
commit 0f9b886
Showing 1 changed file with 66 additions and 17 deletions.
diff --git a/examples/simple-asset-transfer/federations/docker-compose-corda.yml b/examples/simple-asset-transfer/federations/docker-compose-corda.yml
@@ -12,14 +12,14 @@ services:
   corda_validator1:
     image: "federation/validator"
     environment:
+      ETCD_HOSTS: "http://etcd1:2379,http://etcd2:2379,http://etcd3:2379"
       CLIENT_REP_ADDR: "tcp://192.21.0.2:7009"
       PUB_ADDR: "tcp://192.21.0.2:3009"
       REP_ADDR: "tcp://192.21.0.2:5009"
       URL: "http://192.21.0.1:10051"
       USER_NAME: "test"
       PASSWORD: "A665A45920422F9D417E4867EFDC4FB8A04A1F3FFF1FA07E998E86F7F7A27AE3"
       DLT_TYPE: "CORDA"
-      TYPE: "LEADER"
     mem_limit: 6g
     networks:
         corda-network:
@@ -30,21 +30,22 @@ services:
       - "7009:7009"
       - "3009:3009"
       - "5009:5009"
-
+    depends_on:
+      - etcd1
+      - etcd2
+      - etcd3
+
   corda_validator2:
     image: "federation/validator"
     environment:
+      ETCD_HOSTS: "http://etcd1:2379,http://etcd2:2379,http://etcd3:2379"
       CLIENT_REP_ADDR: "tcp://192.21.0.3:7010"
       PUB_ADDR: "tcp://192.21.0.3:3010"
       REP_ADDR: "tcp://192.21.0.3:5010"
-      LEAD_PUB_ADDR: "tcp://192.21.0.2:3009"
-      LEAD_REP_ADDR: "tcp://192.21.0.2:5009"
       USER_NAME: "test"
       PASSWORD: "A665A45920422F9D417E4867EFDC4FB8A04A1F3FFF1FA07E998E86F7F7A27AE3"
-      LEAD_CLIENT_REP_ADDR: "tcp://192.21.0.2:7009"
       URL: "http://192.21.0.1:10052"
       DLT_TYPE: "CORDA"
-      TYPE: "FOLLOWER"
     mem_limit: 6g
     expose:
       - "10052"
@@ -56,21 +57,20 @@ services:
         corda-network:
             ipv4_address: 192.21.0.3
     depends_on:
-      - "corda_validator1"
+      - etcd1
+      - etcd2
+      - etcd3
 
   corda_validator3:
     image: "federation/validator"
     environment:
+      ETCD_HOSTS: "http://etcd1:2379,http://etcd2:2379,http://etcd3:2379"
       CLIENT_REP_ADDR: "tcp://192.21.0.4:7011"
       PUB_ADDR: "tcp://192.21.0.4:3011"
       REP_ADDR: "tcp://192.21.0.4:5011"
-      LEAD_PUB_ADDR: "tcp://192.21.0.2:3009"
-      LEAD_REP_ADDR: "tcp://192.21.0.2:5009"
       USER_NAME: "test"
       PASSWORD: "A665A45920422F9D417E4867EFDC4FB8A04A1F3FFF1FA07E998E86F7F7A27AE3"
-      LEAD_CLIENT_REP_ADDR: "tcp://192.21.0.2:7009"
       URL: "http://192.21.0.1:10053"
-      TYPE: "FOLLOWER"
       DLT_TYPE: "CORDA"
     mem_limit: 6g
     expose:
@@ -83,22 +83,21 @@ services:
         corda-network:
             ipv4_address: 192.21.0.4
     depends_on:
-      - "corda_validator1"
+      - etcd1
+      - etcd2
+      - etcd3
 
   corda_validator4:
     image: "federation/validator"
     environment:
+      ETCD_HOSTS: "http://etcd1:2379,http://etcd2:2379,http://etcd3:2379"
       CLIENT_REP_ADDR: "tcp://192.21.0.5:7012"
       PUB_ADDR: "tcp://192.21.0.5:3012"
       REP_ADDR: "tcp://192.21.0.5:5012"
-      LEAD_PUB_ADDR: "tcp://192.21.0.2:3009"
-      LEAD_REP_ADDR: "tcp://192.21.0.2:5009"
       USER_NAME: "test"
       PASSWORD: "A665A45920422F9D417E4867EFDC4FB8A04A1F3FFF1FA07E998E86F7F7A27AE3"
-      LEAD_CLIENT_REP_ADDR: "tcp://192.21.0.2:7009"
       URL: "http://192.21.0.1:10054"
       DLT_TYPE: "CORDA"
-      TYPE: "FOLLOWER"
     mem_limit: 6g
     expose:
       - "10054"
@@ -110,4 +109,54 @@ services:
         corda-network:
             ipv4_address: 192.21.0.5
     depends_on:
-      - "corda_validator1"
+      - etcd1
+      - etcd2
+      - etcd3
+
+  etcd1:
+    image: bitnami/etcd:3
+    environment:
+      - ALLOW_NONE_AUTHENTICATION=yes
+      - ETCD_NAME=etcd1
+      - ETCD_INITIAL_ADVERTISE_PEER_URLS=http://etcd1:2380
+      - ETCD_LISTEN_PEER_URLS=http://0.0.0.0:2380
+      - ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
+      - ETCD_ADVERTISE_CLIENT_URLS=http://etcd1:2379
+      - ETCD_INITIAL_CLUSTER_TOKEN=etcd-cluster
+      - ETCD_INITIAL_CLUSTER=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
+      - ETCD_INITIAL_CLUSTER_STATE=new
+    networks:
+        corda-network:
+            ipv4_address: 192.21.0.50
+
+  etcd2:
+    image: bitnami/etcd:3
+    environment:
+      - ALLOW_NONE_AUTHENTICATION=yes
+      - ETCD_NAME=etcd2
+      - ETCD_INITIAL_ADVERTISE_PEER_URLS=http://etcd2:2380
+      - ETCD_LISTEN_PEER_URLS=http://0.0.0.0:2380
+      - ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
+      - ETCD_ADVERTISE_CLIENT_URLS=http://etcd2:2379
+      - ETCD_INITIAL_CLUSTER_TOKEN=etcd-cluster
+      - ETCD_INITIAL_CLUSTER=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
+      - ETCD_INITIAL_CLUSTER_STATE=new
+    networks:
+        corda-network:
+            ipv4_address: 192.21.0.51
+
+  etcd3:
+    image: bitnami/etcd:3
+    environment:
+      - ALLOW_NONE_AUTHENTICATION=yes
+      - ETCD_NAME=etcd3
+      - ETCD_INITIAL_ADVERTISE_PEER_URLS=http://etcd3:2380
+      - ETCD_LISTEN_PEER_URLS=http://0.0.0.0:2380
+      - ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
+      - ETCD_ADVERTISE_CLIENT_URLS=http://etcd3:2379
+      - ETCD_INITIAL_CLUSTER_TOKEN=etcd-cluster
+      - ETCD_INITIAL_CLUSTER=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
+      - ETCD_INITIAL_CLUSTER_STATE=new
+    networks:
+        corda-network:
+            ipv4_address: 192.21.0.52