[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 <lehors@us.ibm.com>
hyperledger · Jan 14, 2019 · c7438e1 · c7438e1
1 parent 8a458b5
commit c7438e1
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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