mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-17 15:35:09 +00:00
Bump fabric to v2.5.13 and v3.1.1 (#1328)
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
This commit is contained in:
parent
5fa5abbbcf
commit
cc85f96d9e
7 changed files with 11 additions and 11 deletions
2
.github/actions/fsat-setup/action.yaml
vendored
2
.github/actions/fsat-setup/action.yaml
vendored
|
|
@ -12,7 +12,7 @@ inputs:
|
||||||
default: v0.25.3
|
default: v0.25.3
|
||||||
fabric-version:
|
fabric-version:
|
||||||
description: Version of Hyperledger Fabric
|
description: Version of Hyperledger Fabric
|
||||||
default: "2.5.12"
|
default: "2.5.13"
|
||||||
ca-version:
|
ca-version:
|
||||||
description: Version of Hyperledger Fabric CA
|
description: Version of Hyperledger Fabric CA
|
||||||
default: "1.5.15"
|
default: "1.5.15"
|
||||||
|
|
|
||||||
|
|
@ -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.12
|
default: 2.5.13
|
||||||
ca-version:
|
ca-version:
|
||||||
description: Version of Hyperledger Fabric CA
|
description: Version of Hyperledger Fabric CA
|
||||||
default: 1.5.15
|
default: 1.5.15
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ jobs:
|
||||||
# Note: The default Fabric version for CI is currently the latest LTS (v2.5.x).
|
# Note: The default Fabric version for CI is currently the latest LTS (v2.5.x).
|
||||||
# To test BFT Orderers, Fabric v3.x is explicitly specified here.
|
# To test BFT Orderers, Fabric v3.x is explicitly specified here.
|
||||||
with:
|
with:
|
||||||
fabric-version: 3.1.0
|
fabric-version: 3.1.1
|
||||||
|
|
||||||
- name: Run Test Network with BFT Orderers
|
- name: Run Test Network with BFT Orderers
|
||||||
working-directory: test-network
|
working-directory: test-network
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ function context() {
|
||||||
export ${name}="${!override_name:-${default_value}}"
|
export ${name}="${!override_name:-${default_value}}"
|
||||||
}
|
}
|
||||||
|
|
||||||
context FABRIC_VERSION 2.5.12
|
context FABRIC_VERSION 2.5.13
|
||||||
context FABRIC_CA_VERSION 1.5.15
|
context FABRIC_CA_VERSION 1.5.15
|
||||||
|
|
||||||
context CLUSTER_RUNTIME kind # or k3s for Rancher
|
context CLUSTER_RUNTIME kind # or k3s for Rancher
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ In the current `test-network-k8s`, a Fabric network with three orderers managed
|
||||||
Since BFT Orderers are supported only in Fabric v3.0 and later, you must specify `3.0` or later for the `TEST_NETWORK_FABRIC_VERSION` environment variable. Additionally, set `TEST_NETWORK_ORDERER_TYPE` to `bft` to start the Fabric network and create a channel with BFT consensus type. For example:
|
Since BFT Orderers are supported only in Fabric v3.0 and later, you must specify `3.0` or later for the `TEST_NETWORK_FABRIC_VERSION` environment variable. Additionally, set `TEST_NETWORK_ORDERER_TYPE` to `bft` to start the Fabric network and create a channel with BFT consensus type. For example:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
export TEST_NETWORK_FABRIC_VERSION=3.0
|
export TEST_NETWORK_FABRIC_VERSION=3.1
|
||||||
export TEST_NETWORK_ORDERER_TYPE=bft
|
export TEST_NETWORK_ORDERER_TYPE=bft
|
||||||
|
|
||||||
./network kind
|
./network kind
|
||||||
|
|
@ -39,11 +39,11 @@ First, run the following command to verify that the environment variables are co
|
||||||
```shell
|
```shell
|
||||||
$ ./network
|
$ ./network
|
||||||
|
|
||||||
Fabric image versions: Peer (3.0.0), CA (1.5.13)
|
Fabric image versions: Peer (3.1.1), CA (1.5.15)
|
||||||
Fabric binary versions: Peer (3.0.0), CA (1.5.13)
|
Fabric binary versions: Peer (3.1.1), CA (1.5.15)
|
||||||
|
|
||||||
--- Fabric Information
|
--- Fabric Information
|
||||||
Fabric Version : 3.0
|
Fabric Version : 3.1
|
||||||
Fabric CA Version : 1.5
|
Fabric CA Version : 1.5
|
||||||
Container Registry : hyperledger
|
Container Registry : hyperledger
|
||||||
Network name : test-network
|
Network name : test-network
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
# default image tag, example: "2.5.12". "default" will download the latest. (-i)
|
# default image tag, example: "2.5.13". "default" will download the latest. (-i)
|
||||||
IMAGETAG="default"
|
IMAGETAG="default"
|
||||||
|
|
||||||
# default ca image tag, example: "1.5.15". "default" will download the latest. (-cai)
|
# default ca image tag, example: "1.5.15". "default" will download the latest. (-cai)
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ function printHelp() {
|
||||||
println
|
println
|
||||||
println " Flags:"
|
println " Flags:"
|
||||||
println " Used with \033[0;32mnetwork.sh prereq\033[0m:"
|
println " Used with \033[0;32mnetwork.sh prereq\033[0m:"
|
||||||
println " -i FabricVersion (default: '2.5.12')"
|
println " -i FabricVersion (default: '2.5.13')"
|
||||||
println " -cai Fabric CA Version (default: '1.5.15')"
|
println " -cai Fabric CA Version (default: '1.5.15')"
|
||||||
println
|
println
|
||||||
elif [ "$USAGE" == "up" ]; then
|
elif [ "$USAGE" == "up" ]; then
|
||||||
|
|
@ -159,7 +159,7 @@ function printHelp() {
|
||||||
println
|
println
|
||||||
println " Flags:"
|
println " Flags:"
|
||||||
println " Used with \033[0;32mnetwork.sh prereq\033[0m"
|
println " Used with \033[0;32mnetwork.sh prereq\033[0m"
|
||||||
println " -i FabricVersion (default: '2.5.12')"
|
println " -i FabricVersion (default: '2.5.13')"
|
||||||
println " -cai Fabric CA Version (default: '1.5.15')"
|
println " -cai Fabric CA Version (default: '1.5.15')"
|
||||||
println
|
println
|
||||||
println " Used with \033[0;32mnetwork.sh up\033[0m, \033[0;32mnetwork.sh createChannel\033[0m:"
|
println " Used with \033[0;32mnetwork.sh up\033[0m, \033[0;32mnetwork.sh createChannel\033[0m:"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue