Merge pull request #113 from sstone1/issue-111

Docker hostnames not resolvable, TLS certificates wrong (resolves #111)

Author: Simon Stone

tasks/docker/create-ca.yml

@@ -19,6 +19,8 @@
     image: hyperledger/fabric-ca:1.4.4
     networks:
       - name: "{{ infrastructure.docker.network }}"
+        aliases:
+          - "{{ ca.docker.hostname | mandatory }}"
     networks_cli_compatible: yes
     hostname: "{{ ca.docker.hostname | mandatory }}"
     command: sh -c 'fabric-ca-server start -b {{ ca.admin_identity }}:{{ ca.admin_secret }}'

tasks/docker/create-orderer.yml

@@ -53,7 +53,7 @@
     caname: "{{ ibp[organization.ca.id].tlscaname }}"
     identity: "{{ orderer.tls.identity }}"
     secret: "{{ orderer.tls.secret }}"
-    hostnames: "{{ orderer.docker.name }},localhost"
+    hostnames: "{{ orderer.docker.hostname }},localhost"
   when: orderer.tls.enabled
 
 - name: Add admin user for the MSP to the orderer
@@ -98,6 +98,8 @@
     image: hyperledger/fabric-orderer:1.4.4
     networks:
       - name: "{{ infrastructure.docker.network }}"
+        aliases:
+          - "{{ orderer.docker.hostname | mandatory }}"
     networks_cli_compatible: yes
     hostname: "{{ orderer.docker.hostname | mandatory }}"
     env:

tasks/docker/create-peer.yml

@@ -53,7 +53,7 @@
     caname: "{{ ibp[organization.ca.id].tlscaname }}"
     identity: "{{ peer.tls.identity }}"
     secret: "{{ peer.tls.secret }}"
-    hostnames: "{{ peer.docker.name }},localhost"
+    hostnames: "{{ peer.docker.hostname }},localhost"
   when: peer.tls.enabled
 
 - name: Add admin user for the MSP to the peer
@@ -100,6 +100,8 @@
     image: couchdb:2.3.1
     networks:
       - name: "{{ infrastructure.docker.network }}"
+        aliases:
+          - "{{ peer.docker.couchdb.hostname | mandatory }}"
     networks_cli_compatible: yes
     hostname: "{{ peer.docker.couchdb.hostname | mandatory }}"
     published_ports:
@@ -127,6 +129,8 @@
     image: hyperledger/fabric-peer:1.4.4
     networks:
       - name: "{{ infrastructure.docker.network }}"
+        aliases:
+          - "{{ peer.docker.hostname | mandatory }}"
     networks_cli_compatible: yes
     hostname: "{{ peer.docker.hostname | mandatory }}"
     env:
@@ -135,8 +139,8 @@
       CORE_PEER_LOCALMSPID: "{{ organization.msp.id }}"
       CORE_PEER_LISTENADDRESS: 0.0.0.0:{{ peer.docker.port }}
       CORE_PEER_CHAINCODELISTENADDRESS: 0.0.0.0:{{ peer.docker.chaincode_port }}
-      CORE_PEER_GOSSIP_BOOTSTRAP: "{{ peer.docker.name }}:{{ peer.docker.port }}"
-      CORE_PEER_GOSSIP_EXTERNALENDPOINT: "{{ peer.docker.name }}:{{ peer.docker.port }}"
+      CORE_PEER_GOSSIP_BOOTSTRAP: "{{ peer.docker.hostname }}:{{ peer.docker.port }}"
+      CORE_PEER_GOSSIP_EXTERNALENDPOINT: "{{ peer.docker.hostname }}:{{ peer.docker.port }}"
       CORE_PEER_TLS_ENABLED: "{{ 'true' if peer.tls.enabled else 'false' }}"
       CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE: "{{ infrastructure.docker.network }}"
       CORE_CHAINCODE_BUILDER: hyperledger/fabric-ccenv:1.4.4

templates/docker/configtx.yaml.j2

@@ -237,7 +237,7 @@ Orderer: &OrdererDefaults
     # as TLS validation.  The preferred way to specify orderer addresses is now
     # to include the OrdererEndpoints item in your org definition
     Addresses:
-        - {{ orderer.docker.name }}:{{ orderer.docker.port }}
+        - {{ orderer.docker.hostname }}:{{ orderer.docker.port }}
 
     # Batch Timeout: The amount of time to wait before creating a batch.
     BatchTimeout: 2s