Merge "[FAB-7511] clear crypto material after clearing network"

This commit is contained in:
Keith Smith 2018-01-02 20:45:14 +00:00 committed by Gerrit Code Review
commit 47da1bbeb3
2 changed files with 6 additions and 8 deletions

View file

@ -11,8 +11,8 @@ else
file = util.format(file, '');
// indicate to the application where the setup file is located so it able
// to have the hfc load it to initalize the fabric client instance
hfc.setConfigSetting('network-connection-profile-path',path.join(__dirname, 'app', '../artifacts',file));
hfc.setConfigSetting('Org1-connection-profile-path',path.join(__dirname, 'app', '../artifacts','org1.yaml'));
hfc.setConfigSetting('Org2-connection-profile-path',path.join(__dirname, 'app', '../artifacts','org2.yaml'));
hfc.setConfigSetting('network-connection-profile-path',path.join(__dirname, 'artifacts' ,file));
hfc.setConfigSetting('Org1-connection-profile-path',path.join(__dirname, 'artifacts', 'org1.yaml'));
hfc.setConfigSetting('Org2-connection-profile-path',path.join(__dirname, 'artifacts', 'org2.yaml'));
// some other settings the application might need to know
hfc.addConfigFile(path.join(__dirname, 'config.json'));

View file

@ -30,9 +30,8 @@ function dkrm(){
function restartNetwork() {
echo
#teardown the network and clean the containers and intermediate images
cd artifacts
docker-compose down
#teardown the network and clean the containers and intermediate images
docker-compose -f ./artifacts/docker-compose.yaml down
dkcl
dkrm
@ -40,8 +39,7 @@ function restartNetwork() {
rm -rf ./fabric-client-kv-org*
#Start the network
docker-compose up -d
cd -
docker-compose -f ./artifacts/docker-compose.yaml up -d
echo
}