Merge pull request #74 from davidkel/fixbug

address issue from update orderer node
davidkel · Dec 2, 2021 · 5ce332a · 5ce332a
2 parents ebab2ef + 842ca19
commit 5ce332a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/fabric-network/docker-based-syschannel/network.sh b/fabric-network/docker-based-syschannel/network.sh
@@ -18,6 +18,11 @@ export VERBOSE=false
 
 . scripts/utils.sh
 
+# Create channel-artifacts here otherwise docker will create the dir as root which then causes other stuff to fail
+if [ ! -d "channel-artifacts" ]; then
+	mkdir channel-artifacts
+fi
+
 # Obtain CONTAINER_IDS and remove them
 # TODO Might want to make this optional - could clear other containers
 # This function is called when you bring a network down

diff --git a/fabric-network/docker-based-syschannel/scripts/createChannel.sh b/fabric-network/docker-based-syschannel/scripts/createChannel.sh
@@ -13,10 +13,6 @@ VERBOSE="$4"
 : ${MAX_RETRY:="5"}
 : ${VERBOSE:="false"}
 
-if [ ! -d "channel-artifacts" ]; then
-	mkdir channel-artifacts
-fi
-
 createChannelTx() {
 	set -x
 	configtxgen -profile ApplicationGenesis -outputCreateChannelTx ./channel-artifacts/${CHANNEL_NAME}.tx -channelID $CHANNEL_NAME

diff --git a/fabric-network/docker-based-syschannel/scripts/setAnchorPeer.sh b/fabric-network/docker-based-syschannel/scripts/setAnchorPeer.sh
@@ -45,13 +45,14 @@ createAnchorPeerUpdate() {
 }
 
 updateAnchorPeer() {
+  timestamp
   set -x
   peer channel update -o localhost:7050 --ordererTLSHostnameOverride orderer1.example.com -c $CHANNEL_NAME -f ${CORE_PEER_LOCALMSPID}anchors.tx --tls --cafile $ORDERER_CA >&log.txt
   res=$?
   { set +x; } 2>/dev/null
   cat log.txt
   verifyResult $res "Anchor peer update failed"
-  successln "Anchor peer set for org '$CORE_PEER_LOCALMSPID' on channel '$CHANNEL_NAME'"
+  successln "$(timestamp) Anchor peer set for org '$CORE_PEER_LOCALMSPID' on channel '$CHANNEL_NAME'"
 }
 
 ORG=$1

diff --git a/fabric-network/docker-based-syschannel/scripts/updateChannelConfig.sh b/fabric-network/docker-based-syschannel/scripts/updateChannelConfig.sh
@@ -49,8 +49,9 @@ signConfigtxAsPeerOrg 2 org4_update_in_envelope.pb
 
 infoln "Submitting transaction from a different peer (peer0.org3) which also signs it"
 setGlobals 3
+timestamp
 set -x
 peer channel update -f org4_update_in_envelope.pb -c ${CHANNEL_NAME} -o localhost:7050 --ordererTLSHostnameOverride orderer1.example.com --tls --cafile "$ORDERER_CA"
 { set +x; } 2>/dev/null
 
-successln "Config transaction to add org4 to network submitted"
+successln "$(timestamp) Config transaction to add org4 to network submitted"