epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-21 17:15:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FAB-13668] BYFN's container volume mapping is bad

Browse source 
Updated compose files and scripts to use the correct mapping.

Change-Id: Iccbe384393c2736c5ba197d70ef6a124588ad588
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
This commit is contained in:
Arnaud J Le Hors 2019-01-14 15:25:28 +01:00
parent 8a458b5cdc
commit c7438e1f7c
8 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
first-network/docker-compose-cli.yaml
View file

@ -79,7 +79,7 @@ services:
command: /bin/bash command: /bin/bash
volumes: volumes:
- /var/run/:/host/var/run/ - /var/run/:/host/var/run/
- ./../chaincode/:/opt/gopath/src/github.com/chaincode - ./../chaincode/:/opt/gopath/src/github.com/hyperledger/fabric-samples/chaincode
- ./crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ - ./crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/
- ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/
- ./channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts - ./channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts

2
first-network/docker-compose-org3.yaml
View file

@ -80,7 +80,7 @@ services:
command: /bin/bash command: /bin/bash
volumes: volumes:
- /var/run/:/host/var/run/ - /var/run/:/host/var/run/
- ./../chaincode/:/opt/gopath/src/github.com/chaincode - ./../chaincode/:/opt/gopath/src/github.com/hyperledger/fabric-samples/chaincode
- ./org3-artifacts/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ - ./org3-artifacts/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/
- ./crypto-config/peerOrganizations/org1.example.com:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com - ./crypto-config/peerOrganizations/org1.example.com:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com
- ./crypto-config/peerOrganizations/org2.example.com:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org2.example.com - ./crypto-config/peerOrganizations/org2.example.com:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org2.example.com

6
first-network/scripts/script.sh
View file

@ -23,13 +23,13 @@ LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]`
COUNTER=1 COUNTER=1
MAX_RETRY=10 MAX_RETRY=10
CC_SRC_PATH="github.com/chaincode/chaincode_example02/go/" CC_SRC_PATH="github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/go/"
if [ "$LANGUAGE" = "node" ]; then if [ "$LANGUAGE" = "node" ]; then
CC_SRC_PATH="/opt/gopath/src/github.com/chaincode/chaincode_example02/node/" CC_SRC_PATH="/opt/gopath/src/github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/node/"
fi fi
if [ "$LANGUAGE" = "java" ]; then if [ "$LANGUAGE" = "java" ]; then
CC_SRC_PATH="/opt/gopath/src/github.com/chaincode/chaincode_example02/java/" CC_SRC_PATH="/opt/gopath/src/github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/java/"
fi fi
echo "Channel name : "$CHANNEL_NAME echo "Channel name : "$CHANNEL_NAME

4
first-network/scripts/step1org3.sh
View file

@ -25,9 +25,9 @@ LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]`
COUNTER=1 COUNTER=1
MAX_RETRY=5 MAX_RETRY=5
CC_SRC_PATH="github.com/chaincode/chaincode_example02/go/" CC_SRC_PATH="github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/go/"
if [ "$LANGUAGE" = "node" ]; then if [ "$LANGUAGE" = "node" ]; then
CC_SRC_PATH="/opt/gopath/src/github.com/chaincode/chaincode_example02/node/" CC_SRC_PATH="/opt/gopath/src/github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/node/"
fi fi
# import utils # import utils

4
first-network/scripts/step2org3.sh
View file

@ -28,9 +28,9 @@ LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]`
COUNTER=1 COUNTER=1
MAX_RETRY=5 MAX_RETRY=5
CC_SRC_PATH="github.com/chaincode/chaincode_example02/go/" CC_SRC_PATH="github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/go/"
if [ "$LANGUAGE" = "node" ]; then if [ "$LANGUAGE" = "node" ]; then
CC_SRC_PATH="/opt/gopath/src/github.com/chaincode/chaincode_example02/node/" CC_SRC_PATH="/opt/gopath/src/github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/node/"
fi fi
# import utils # import utils

4
first-network/scripts/step3org3.sh
View file

@ -29,9 +29,9 @@ LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]`
COUNTER=1 COUNTER=1
MAX_RETRY=5 MAX_RETRY=5
CC_SRC_PATH="github.com/chaincode/chaincode_example02/go/" CC_SRC_PATH="github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/go/"
if [ "$LANGUAGE" = "node" ]; then if [ "$LANGUAGE" = "node" ]; then
CC_SRC_PATH="/opt/gopath/src/github.com/chaincode/chaincode_example02/node/" CC_SRC_PATH="/opt/gopath/src/github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/node/"
fi fi
# import utils # import utils

4
first-network/scripts/testorg3.sh
View file

@ -33,9 +33,9 @@ LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]`
COUNTER=1 COUNTER=1
MAX_RETRY=5 MAX_RETRY=5
CC_SRC_PATH="github.com/chaincode/chaincode_example02/go/" CC_SRC_PATH="github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/go/"
if [ "$LANGUAGE" = "node" ]; then if [ "$LANGUAGE" = "node" ]; then
CC_SRC_PATH="/opt/gopath/src/github.com/chaincode/chaincode_example02/node/" CC_SRC_PATH="/opt/gopath/src/github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/node/"
fi fi
echo "Channel name : "$CHANNEL_NAME echo "Channel name : "$CHANNEL_NAME

4
first-network/scripts/upgrade_to_v14.sh
View file

@ -23,9 +23,9 @@ LANGUAGE=$(echo "$LANGUAGE" | tr [:upper:] [:lower:])
COUNTER=1 COUNTER=1
MAX_RETRY=5 MAX_RETRY=5
CC_SRC_PATH="github.com/chaincode/chaincode_example02/go/" CC_SRC_PATH="github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/go/"
if [ "$LANGUAGE" = "node" ]; then if [ "$LANGUAGE" = "node" ]; then
CC_SRC_PATH="/opt/gopath/src/github.com/chaincode/chaincode_example02/node/" CC_SRC_PATH="/opt/gopath/src/github.com/hyperledger/fabric-samples/chaincode/chaincode_example02/node/"
fi fi
echo "Channel name : "$CHANNEL_NAME echo "Channel name : "$CHANNEL_NAME