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

Add 1.x versions of fabric to blacklisted versions

Browse source 
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
This commit is contained in:
NIKHIL E GUPTA 2020-01-17 13:36:37 -05:00 committed by Gari Singh
parent 8ca279d53d
commit 1488fbbe01
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test-network/network.sh
View file

@ -79,8 +79,8 @@ function removeUnwantedImages() {
fi fi
} }
# Versions of fabric known not to work with this release of first-network # Versions of fabric known not to work with the test network
BLACKLISTED_VERSIONS="^1\.0\. ^1\.1\.0-preview ^1\.1\.0-alpha" BLACKLISTED_VERSIONS="^1\.0\. ^1\.1\. ^1\.2\. ^1\.3\. ^1\.4\."
# Do some basic sanity checking to make sure that the appropriate versions of fabric # Do some basic sanity checking to make sure that the appropriate versions of fabric
# binaries/images are available. In the future, additional checking for the presence # binaries/images are available. In the future, additional checking for the presence
@ -114,13 +114,13 @@ function checkPrereqs() {
for UNSUPPORTED_VERSION in $BLACKLISTED_VERSIONS; do for UNSUPPORTED_VERSION in $BLACKLISTED_VERSIONS; do
echo "$LOCAL_VERSION" | grep -q $UNSUPPORTED_VERSION echo "$LOCAL_VERSION" | grep -q $UNSUPPORTED_VERSION
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "ERROR! Local Fabric binary version of $LOCAL_VERSION does not match this newer version of the network and is unsupported. Either move to a later version of Fabric or checkout an earlier version of fabric-samples." echo "ERROR! Local Fabric binary version of $LOCAL_VERSION does not match the versions supported by the test network."
exit 1 exit 1
fi fi
echo "$DOCKER_IMAGE_VERSION" | grep -q $UNSUPPORTED_VERSION echo "$DOCKER_IMAGE_VERSION" | grep -q $UNSUPPORTED_VERSION
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "ERROR! Fabric Docker image version of $DOCKER_IMAGE_VERSION does not match this newer version of the network and is unsupported. Either move to a later version of Fabric or checkout an earlier version of fabric-samples." echo "ERROR! Fabric Docker image version of $DOCKER_IMAGE_VERSION does not match the versions supported by the test network."
exit 1 exit 1
fi fi
done done
@ -437,8 +437,6 @@ COMPOSE_FILE_ORG3=addOrg3/docker/docker-compose-org3.yaml
CC_RUNTIME_LANGUAGE=golang CC_RUNTIME_LANGUAGE=golang
# Chaincode version # Chaincode version
VERSION=1 VERSION=1
# Chaincode source path
CC_SRC_PATH="../chaincode/fabcar/go/"
# default image tag # default image tag
IMAGETAG="latest" IMAGETAG="latest"
# default database # default database