temporal fix for #48

olegabu · Mar 7, 2019 · 9222eb4 · 9222eb4
1 parent bc43931
commit 9222eb4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/container-scripts/container-orderer.sh b/container-scripts/container-orderer.sh
@@ -9,6 +9,10 @@ if [ ! -f "crypto-config/ordererOrganizations/$DOMAIN/orderers/orderer.$DOMAIN/m
     envsubst < "templates/cryptogen-orderer-template.yaml" > "crypto-config/cryptogen-orderer.yaml"
     rm -rf crypto-config/ordererOrganizations
     cryptogen generate --config=crypto-config/cryptogen-orderer.yaml
+
+    mkdir -p crypto-config/ordererOrganizations/$DOMAIN/msp/well-known
+    cp crypto-config/ordererOrganizations/$DOMAIN/msp/tlscacerts/tlsca.$DOMAIN-cert.pem crypto-config/ordererOrganizations/$DOMAIN/msp/well-known/msp-admin.pem 2>/dev/null
+    cp crypto-config/ordererOrganizations/$DOMAIN/msp/tlscacerts/tlsca.$DOMAIN-cert.pem crypto-config/ordererOrganizations/$DOMAIN/msp/well-known/tlsca-cert.pem 2>/dev/null
 else
     echo "Orderer MSP exists. Generation skipped".
 fi

diff --git a/container-scripts/container-peer.sh b/container-scripts/container-peer.sh
@@ -24,6 +24,10 @@ if [ ! -d "crypto-config/peerOrganizations/$ORG.$DOMAIN/peers/peer0.$ORG.$DOMAIN
     mv crypto-config/peerOrganizations/$ORG.$DOMAIN/ca/*_sk crypto-config/peerOrganizations/$ORG.$DOMAIN/ca/sk.pem
     mv crypto-config/peerOrganizations/$ORG.$DOMAIN/users/Admin@$ORG.$DOMAIN/msp/keystore/*_sk crypto-config/peerOrganizations/$ORG.$DOMAIN/users/Admin@$ORG.$DOMAIN/msp/keystore/sk.pem
     cp -r crypto-config/ordererOrganizations/$DOMAIN/msp/* crypto-config/peerOrganizations/$ORG.$DOMAIN/msp 2>/dev/null
+
+    mkdir -p crypto-config/peerOrganizations/$ORG.$DOMAIN/msp/well-known
+    cp crypto-config/peerOrganizations/$ORG.$DOMAIN/msp/tlscacerts/tlsca.$ORG.$DOMAIN-cert.pem crypto-config/peerOrganizations/$ORG.$DOMAIN/msp/well-known/msp-admin.pem 2>/dev/null
+    cp crypto-config/peerOrganizations/$ORG.$DOMAIN/msp/tlscacerts/tlsca.$ORG.$DOMAIN-cert.pem crypto-config/peerOrganizations/$ORG.$DOMAIN/msp/well-known/tlsca-cert.pem 2>/dev/null
 else
     echo "$ORG MSP exists. Generation skipped".
 fi
diff --git a/docker-compose-orderer.yaml b/docker-compose-orderer.yaml
@@ -149,5 +149,6 @@ services:
     #      - ${WWW_PORT:-8080}:80
     volumes:
       - ./crypto-config/ordererOrganizations/${DOMAIN:-example.com}/msp:/usr/share/nginx/html/msp
+      - ./crypto-config/ordererOrganizations/${DOMAIN:-example.com}/msp/well-known:/usr/share/nginx/html/.well-known
     depends_on:
     - generate.post-orderer
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -194,7 +194,7 @@ services:
 #      - peer1
     volumes:
       - ./crypto-config:/usr/src/app/crypto-config
-      - ./templates:/usr/src/app/templates
+#      - ./templates:/usr/src/app/templates
       - ${WEBAPP_HOME:-./webapp}:/usr/src/app/webapp
       - ./crypto-config/peerOrganizations/${ORG:-org1}.${DOMAIN:-example.com}/msp:/usr/src/app/msp
       - ./crypto-config/peerOrganizations/${ORG:-org1}.${DOMAIN:-example.com}/users/Admin@${ORG:-org1}.${DOMAIN:-example.com}:/etc/hyperledger/crypto/peeradmin
@@ -209,6 +209,7 @@ services:
       - generate.peer
     volumes:
       - ./crypto-config/peerOrganizations/${ORG:-org1}.${DOMAIN:-example.com}/msp:/usr/share/nginx/html/msp
+      - ./crypto-config/peerOrganizations/${ORG:-org1}.${DOMAIN:-example.com}/msp/well-known:/usr/share/nginx/html/.well-known
 
 networks:
   default: