From 8cb3057161bb1c33d1c03c00c761722cc18c6670 Mon Sep 17 00:00:00 2001 From: Jason Yellick Date: Wed, 15 Feb 2017 15:29:04 -0500 Subject: [PATCH] [FAB-2257] Fix local orderer startup https://jira.hyperledger.org/browse/FAB-2257 In fixing the orderer docker startup, the orderer.yaml file was modified to include the LocalMSPDir. This was required because without the variable in the yaml, the environment variable would not take effect. However, this orderer.yaml variable was incorrectly set to ../msp when it was being set as a default in code to ../msp/sampleconfig. This CR fixes that. Change-Id: I775b70a0d14d5a9b13ed71b71ef196a70748690a Signed-off-by: Jason Yellick --- images/testenv/Dockerfile.in | 2 ++ orderer/orderer.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/testenv/Dockerfile.in b/images/testenv/Dockerfile.in index bef1473e0b2..ea226a2367c 100644 --- a/images/testenv/Dockerfile.in +++ b/images/testenv/Dockerfile.in @@ -3,6 +3,8 @@ FROM hyperledger/fabric-buildenv:_TAG_ # fabric configuration locations ENV PEER_CFG_PATH /etc/hyperledger/fabric ENV ORDERER_CFG_PATH /etc/hyperledger/fabric +ENV CORE_PEER_MSPCONFIGPATH $PEER_CFG_PATH/msp/sampleconfig +ENV ORDERER_GENERAL_LOCALMSPDIR $ORDERER_CFG_PATH/msp/sampleconfig # create needed directories RUN mkdir -p \ diff --git a/orderer/orderer.yaml b/orderer/orderer.yaml index 02c5a977e99..97dc4652413 100644 --- a/orderer/orderer.yaml +++ b/orderer/orderer.yaml @@ -55,7 +55,7 @@ General: # LocalMSPDir is where to find the crypto material needed for signing in the orderer # It is set relative here as a default for dev environments but should be changed to the # real location in production - LocalMSPDir: ../msp/ + LocalMSPDir: msp/sampleconfig # LocalMSPID is the identity to register the local MSP material with the MSP manager # ----!!!!IMPORTANT!!!-!!!IMPORTANT!!!-!!!IMPORTANT!!!!----