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

Update samples to use Fabric v2.5.0-beta2 by default

Browse source 
Update samples to use Fabric v2.5.0-beta2 by default.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
This commit is contained in:
David Enyeart 2023-03-14 16:44:37 -04:00
parent 85fbbc0924
commit 16ad5245dd
6 changed files with 35 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/actions/test-network-setup/action.yaml vendored
View file

@ -12,7 +12,7 @@ inputs:
default: 11.x default: 11.x
fabric-version: fabric-version:
description: Version of Hyperledger Fabric description: Version of Hyperledger Fabric
default: 2.5.0-alpha3 default: 2.5.0-beta2
ca-version: ca-version:
description: Version of Hyperledger Fabric CA description: Version of Hyperledger Fabric CA
default: 1.5.6-beta3 default: 1.5.6-beta3

15
ci/scripts/pullFabricImages.sh
View file

@ -1,15 +0,0 @@
#!/bin/bash -e
set -euo pipefail
FABRIC_VERSION=${FABRIC_VERSION:-2.4}
STABLE_TAG=amd64-${FABRIC_VERSION}-stable
for image in baseos peer orderer ca tools orderer ccenv javaenv nodeenv tools; do
docker pull -q "hyperledger-fabric.jfrog.io/fabric-${image}:${STABLE_TAG}"
docker tag "hyperledger-fabric.jfrog.io/fabric-${image}:${STABLE_TAG}" hyperledger/fabric-${image}
docker tag "hyperledger-fabric.jfrog.io/fabric-${image}:${STABLE_TAG}" "hyperledger/fabric-${image}:${FABRIC_VERSION}"
docker rmi -f "hyperledger-fabric.jfrog.io/fabric-${image}:${STABLE_TAG}"
done
docker pull -q couchdb:3.1.1
docker images | grep hyperledger

6
full-stack-asset-transfer-guide/infrastructure/multipass-cloud-config.yaml
View file

@ -33,8 +33,8 @@ write_files:
HLF_VERSION=$1 HLF_VERSION=$1
fi fi
if [ ${HLF_VERSION:0:4} = '2.4.' ]; then if [ ${HLF_VERSION:0:4} = '2.5.' -o ${HLF_VERSION:0:4} = '2.4.']; then
export GO_VERSION=1.17.10 export GO_VERSION=1.18.10
elif [ ${HLF_VERSION:0:4} = '2.2.' -o ${HLF_VERSION:0:4} = '2.3.' ]; then elif [ ${HLF_VERSION:0:4} = '2.2.' -o ${HLF_VERSION:0:4} = '2.3.' ]; then
export GO_VERSION=1.14.11 export GO_VERSION=1.14.11
elif [ ${HLF_VERSION:0:4} = '2.0.' -o ${HLF_VERSION:0:4} = '2.1.' ]; then elif [ ${HLF_VERSION:0:4} = '2.0.' -o ${HLF_VERSION:0:4} = '2.1.' ]; then
@ -45,7 +45,7 @@ write_files:
export GO_VERSION=1.9.7 export GO_VERSION=1.9.7
else else
>&2 echo "Unexpected HLF_VERSION ${HLF_VERSION}" >&2 echo "Unexpected HLF_VERSION ${HLF_VERSION}"
>&2 echo "HLF_VERSION must be a 1.1.x, 1.2.x, 1.3.x, 1.4.x, 2.0.x, 2.1.x, 2.2.x, 2.3.x, or 2.4.x version" >&2 echo "HLF_VERSION must be a 1.1.x, 1.2.x, 1.3.x, 1.4.x, 2.0.x, 2.1.x, 2.2.x, 2.3.x, 2.4.x, or 2.5.x version"
exit 1 exit 1
fi fi

2
full-stack-asset-transfer-guide/infrastructure/sample-network/network
View file

@ -33,7 +33,7 @@ function context() {
export ${name}="${!override_name:-${default_value}}" export ${name}="${!override_name:-${default_value}}"
} }
context FABRIC_VERSION 2.4.4 context FABRIC_VERSION 2.5.0-beta2
context FABRIC_CA_VERSION 1.5.5 context FABRIC_CA_VERSION 1.5.5
context CLUSTER_RUNTIME kind # or k3s for Rancher context CLUSTER_RUNTIME kind # or k3s for Rancher