From c7438e1f7c03be5310286ffc5f22f9da615f022b Mon Sep 17 00:00:00 2001 From: Arnaud J Le Hors Date: Mon, 14 Jan 2019 15:25:28 +0100 Subject: [PATCH] [FAB-13668] BYFN's container volume mapping is bad Updated compose files and scripts to use the correct mapping. Change-Id: Iccbe384393c2736c5ba197d70ef6a124588ad588 Signed-off-by: Arnaud J Le Hors --- first-network/docker-compose-cli.yaml | 2 +- first-network/docker-compose-org3.yaml | 2 +- first-network/scripts/script.sh | 6 +++--- first-network/scripts/step1org3.sh | 4 ++-- first-network/scripts/step2org3.sh | 4 ++-- first-network/scripts/step3org3.sh | 4 ++-- first-network/scripts/testorg3.sh | 4 ++-- first-network/scripts/upgrade_to_v14.sh | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/first-network/docker-compose-cli.yaml b/first-network/docker-compose-cli.yaml index a18bbc2564..7ad11f019c 100644 --- a/first-network/docker-compose-cli.yaml +++ b/first-network/docker-compose-cli.yaml @@ -79,7 +79,7 @@ services: command: /bin/bash volumes: - /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/ - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ - ./channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts diff --git a/first-network/docker-compose-org3.yaml b/first-network/docker-compose-org3.yaml index 8da911b1f9..71475ce650 100644 --- a/first-network/docker-compose-org3.yaml +++ b/first-network/docker-compose-org3.yaml @@ -80,7 +80,7 @@ services: command: /bin/bash volumes: - /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/ - ./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 diff --git a/first-network/scripts/script.sh b/first-network/scripts/script.sh index b720f08b7b..664dfba8f4 100755 --- a/first-network/scripts/script.sh +++ b/first-network/scripts/script.sh @@ -23,13 +23,13 @@ LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]` COUNTER=1 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 - 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 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 echo "Channel name : "$CHANNEL_NAME diff --git a/first-network/scripts/step1org3.sh b/first-network/scripts/step1org3.sh index bff4d6a047..94e9d00548 100755 --- a/first-network/scripts/step1org3.sh +++ b/first-network/scripts/step1org3.sh @@ -25,9 +25,9 @@ LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]` COUNTER=1 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 - 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 # import utils diff --git a/first-network/scripts/step2org3.sh b/first-network/scripts/step2org3.sh index 75745ef936..734a0d7cdf 100755 --- a/first-network/scripts/step2org3.sh +++ b/first-network/scripts/step2org3.sh @@ -28,9 +28,9 @@ LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]` COUNTER=1 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 - 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 # import utils diff --git a/first-network/scripts/step3org3.sh b/first-network/scripts/step3org3.sh index 9588a8b8af..6a3ac3d567 100755 --- a/first-network/scripts/step3org3.sh +++ b/first-network/scripts/step3org3.sh @@ -29,9 +29,9 @@ LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]` COUNTER=1 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 - 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 # import utils diff --git a/first-network/scripts/testorg3.sh b/first-network/scripts/testorg3.sh index 6d1930cd06..e7a396de7f 100755 --- a/first-network/scripts/testorg3.sh +++ b/first-network/scripts/testorg3.sh @@ -33,9 +33,9 @@ LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]` COUNTER=1 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 - 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 echo "Channel name : "$CHANNEL_NAME diff --git a/first-network/scripts/upgrade_to_v14.sh b/first-network/scripts/upgrade_to_v14.sh index e26498f447..fc671ac2a8 100755 --- a/first-network/scripts/upgrade_to_v14.sh +++ b/first-network/scripts/upgrade_to_v14.sh @@ -23,9 +23,9 @@ LANGUAGE=$(echo "$LANGUAGE" | tr [:upper:] [:lower:]) COUNTER=1 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 - 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 echo "Channel name : "$CHANNEL_NAME