From 1005cd382664454452f7f5b2e5c336ad1f350fb1 Mon Sep 17 00:00:00 2001 From: Tatsuya Sato Date: Wed, 12 Mar 2025 09:53:05 +0000 Subject: [PATCH] Bump fabric to v2.5.12 This patch bumps fabric to v2.5.12. It also updates some parts of fabric-ca that were missed in the previous update. Signed-off-by: Tatsuya Sato --- .github/actions/fsat-setup/action.yaml | 2 +- .github/actions/test-network-setup/action.yaml | 2 +- .../infrastructure/sample-network/network | 4 ++-- test-network/network.config | 4 ++-- test-network/scripts/utils.sh | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/actions/fsat-setup/action.yaml b/.github/actions/fsat-setup/action.yaml index 10a7cfa4..24ecf65f 100644 --- a/.github/actions/fsat-setup/action.yaml +++ b/.github/actions/fsat-setup/action.yaml @@ -12,7 +12,7 @@ inputs: default: v0.25.3 fabric-version: description: Version of Hyperledger Fabric - default: "2.5.11" + default: "2.5.12" ca-version: description: Version of Hyperledger Fabric CA default: "1.5.15" diff --git a/.github/actions/test-network-setup/action.yaml b/.github/actions/test-network-setup/action.yaml index fc3eca11..b218afa3 100644 --- a/.github/actions/test-network-setup/action.yaml +++ b/.github/actions/test-network-setup/action.yaml @@ -12,7 +12,7 @@ inputs: default: 11.x fabric-version: description: Version of Hyperledger Fabric - default: 2.5.11 + default: 2.5.12 ca-version: description: Version of Hyperledger Fabric CA default: 1.5.15 diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/network b/full-stack-asset-transfer-guide/infrastructure/sample-network/network index 90f562f6..2356e4cb 100755 --- a/full-stack-asset-transfer-guide/infrastructure/sample-network/network +++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/network @@ -33,8 +33,8 @@ function context() { export ${name}="${!override_name:-${default_value}}" } -context FABRIC_VERSION 2.5.11 -context FABRIC_CA_VERSION 1.5.14 +context FABRIC_VERSION 2.5.12 +context FABRIC_CA_VERSION 1.5.15 context CLUSTER_RUNTIME kind # or k3s for Rancher context CONTAINER_CLI docker # or nerdctl for containerd diff --git a/test-network/network.config b/test-network/network.config index f11d9c73..f4af0ae0 100644 --- a/test-network/network.config +++ b/test-network/network.config @@ -1,7 +1,7 @@ -# default image tag, example: "2.5.11". "default" will download the latest. (-i) +# default image tag, example: "2.5.12". "default" will download the latest. (-i) IMAGETAG="default" -# default ca image tag, example: "1.5.14". "default" will download the latest. (-cai) +# default ca image tag, example: "1.5.15". "default" will download the latest. (-cai) CA_IMAGETAG="default" # Using crpto vs CA. default is cryptogen diff --git a/test-network/scripts/utils.sh b/test-network/scripts/utils.sh index 49ea1d1d..bda1c99b 100755 --- a/test-network/scripts/utils.sh +++ b/test-network/scripts/utils.sh @@ -17,8 +17,8 @@ function printHelp() { println println " Flags:" println " Used with \033[0;32mnetwork.sh prereq\033[0m:" - println " -i FabricVersion (default: '2.5.11')" - println " -cai Fabric CA Version (default: '1.5.14')" + println " -i FabricVersion (default: '2.5.12')" + println " -cai Fabric CA Version (default: '1.5.15')" println elif [ "$USAGE" == "up" ]; then println "Usage: " @@ -159,8 +159,8 @@ function printHelp() { println println " Flags:" println " Used with \033[0;32mnetwork.sh prereq\033[0m" - println " -i FabricVersion (default: '2.5.11')" - println " -cai Fabric CA Version (default: '1.5.14')" + println " -i FabricVersion (default: '2.5.12')" + println " -cai Fabric CA Version (default: '1.5.15')" println println " Used with \033[0;32mnetwork.sh up\033[0m, \033[0;32mnetwork.sh createChannel\033[0m:" println " -ca - Use Certificate Authorities to generate network crypto material"