mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-22 09:35:10 +00:00
Bump fabric to v3.0.0-rc1
Bump fabric to v3.0.0-rc1. Signed-off-by: David Enyeart <enyeart@us.ibm.com>
This commit is contained in:
parent
571d51671d
commit
8966eaf24a
5 changed files with 12 additions and 12 deletions
4
.github/actions/fsat-setup/action.yaml
vendored
4
.github/actions/fsat-setup/action.yaml
vendored
|
|
@ -12,10 +12,10 @@ 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.7'
|
default: '3.0.0-rc1'
|
||||||
ca-version:
|
ca-version:
|
||||||
description: Version of Hyperledger Fabric CA
|
description: Version of Hyperledger Fabric CA
|
||||||
default: '1.5.10'
|
default: '1.5.12'
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: "composite"
|
using: "composite"
|
||||||
|
|
|
||||||
|
|
@ -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.9
|
default: 3.0.0-rc1
|
||||||
ca-version:
|
ca-version:
|
||||||
description: Version of Hyperledger Fabric CA
|
description: Version of Hyperledger Fabric CA
|
||||||
default: 1.5.12
|
default: 1.5.12
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ function context() {
|
||||||
export ${name}="${!override_name:-${default_value}}"
|
export ${name}="${!override_name:-${default_value}}"
|
||||||
}
|
}
|
||||||
|
|
||||||
context FABRIC_VERSION 2.5.9
|
context FABRIC_VERSION 3.0.0-rc1
|
||||||
context FABRIC_CA_VERSION 1.5.12
|
context FABRIC_CA_VERSION 1.5.12
|
||||||
|
|
||||||
context CLUSTER_RUNTIME kind # or k3s for Rancher
|
context CLUSTER_RUNTIME kind # or k3s for Rancher
|
||||||
|
|
|
||||||
|
|
@ -200,7 +200,7 @@ peer:
|
||||||
# and the private data residing inside the transient store that is guaranteed not to be purged.
|
# and the private data residing inside the transient store that is guaranteed not to be purged.
|
||||||
# Private data is purged from the transient store when blocks with sequences that are multiples
|
# Private data is purged from the transient store when blocks with sequences that are multiples
|
||||||
# of transientstoreMaxBlockRetention are committed.
|
# of transientstoreMaxBlockRetention are committed.
|
||||||
transientstoreMaxBlockRetention: 1000
|
transientstoreMaxBlockRetention: 20000
|
||||||
# pushAckTimeout is the maximum time to wait for an acknowledgement from each peer
|
# pushAckTimeout is the maximum time to wait for an acknowledgement from each peer
|
||||||
# at private data push at endorsement time.
|
# at private data push at endorsement time.
|
||||||
pushAckTimeout: 3s
|
pushAckTimeout: 3s
|
||||||
|
|
@ -363,7 +363,7 @@ peer:
|
||||||
# via gossip.
|
# via gossip.
|
||||||
# Note that 'gossip.state.enabled' controls point to point block replication
|
# Note that 'gossip.state.enabled' controls point to point block replication
|
||||||
# of blocks committed in the past.
|
# of blocks committed in the past.
|
||||||
blockGossipEnabled: true
|
blockGossipEnabled: false
|
||||||
# It sets the total time the delivery service may spend in reconnection
|
# It sets the total time the delivery service may spend in reconnection
|
||||||
# attempts until its retry logic gives up and returns an error
|
# attempts until its retry logic gives up and returns an error
|
||||||
reconnectTotalTimeThreshold: 3600s
|
reconnectTotalTimeThreshold: 3600s
|
||||||
|
|
@ -573,11 +573,11 @@ chaincode:
|
||||||
# tools added for java shim layer packaging.
|
# tools added for java shim layer packaging.
|
||||||
# This image is packed with shim layer libraries that are necessary
|
# This image is packed with shim layer libraries that are necessary
|
||||||
# for Java chaincode runtime.
|
# for Java chaincode runtime.
|
||||||
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
|
runtime: $(DOCKER_NS)/fabric-javaenv:2.5
|
||||||
|
|
||||||
node:
|
node:
|
||||||
# This is an image based on node:$(NODE_VER)-alpine
|
# This is an image based on node:$(NODE_VER)-alpine
|
||||||
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
|
runtime: $(DOCKER_NS)/fabric-nodeenv:2.5
|
||||||
|
|
||||||
# List of directories to treat as external builders and launchers for
|
# List of directories to treat as external builders and launchers for
|
||||||
# chaincode. The external builder detection processing will iterate over the
|
# chaincode. The external builder detection processing will iterate over the
|
||||||
|
|
|
||||||
|
|
@ -200,7 +200,7 @@ peer:
|
||||||
# and the private data residing inside the transient store that is guaranteed not to be purged.
|
# and the private data residing inside the transient store that is guaranteed not to be purged.
|
||||||
# Private data is purged from the transient store when blocks with sequences that are multiples
|
# Private data is purged from the transient store when blocks with sequences that are multiples
|
||||||
# of transientstoreMaxBlockRetention are committed.
|
# of transientstoreMaxBlockRetention are committed.
|
||||||
transientstoreMaxBlockRetention: 1000
|
transientstoreMaxBlockRetention: 20000
|
||||||
# pushAckTimeout is the maximum time to wait for an acknowledgement from each peer
|
# pushAckTimeout is the maximum time to wait for an acknowledgement from each peer
|
||||||
# at private data push at endorsement time.
|
# at private data push at endorsement time.
|
||||||
pushAckTimeout: 3s
|
pushAckTimeout: 3s
|
||||||
|
|
@ -363,7 +363,7 @@ peer:
|
||||||
# via gossip.
|
# via gossip.
|
||||||
# Note that 'gossip.state.enabled' controls point to point block replication
|
# Note that 'gossip.state.enabled' controls point to point block replication
|
||||||
# of blocks committed in the past.
|
# of blocks committed in the past.
|
||||||
blockGossipEnabled: true
|
blockGossipEnabled: false
|
||||||
# It sets the total time the delivery service may spend in reconnection
|
# It sets the total time the delivery service may spend in reconnection
|
||||||
# attempts until its retry logic gives up and returns an error
|
# attempts until its retry logic gives up and returns an error
|
||||||
reconnectTotalTimeThreshold: 3600s
|
reconnectTotalTimeThreshold: 3600s
|
||||||
|
|
@ -573,11 +573,11 @@ chaincode:
|
||||||
# tools added for java shim layer packaging.
|
# tools added for java shim layer packaging.
|
||||||
# This image is packed with shim layer libraries that are necessary
|
# This image is packed with shim layer libraries that are necessary
|
||||||
# for Java chaincode runtime.
|
# for Java chaincode runtime.
|
||||||
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
|
runtime: $(DOCKER_NS)/fabric-javaenv:2.5
|
||||||
|
|
||||||
node:
|
node:
|
||||||
# This is an image based on node:$(NODE_VER)-alpine
|
# This is an image based on node:$(NODE_VER)-alpine
|
||||||
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
|
runtime: $(DOCKER_NS)/fabric-nodeenv:2.5
|
||||||
|
|
||||||
# List of directories to treat as external builders and launchers for
|
# List of directories to treat as external builders and launchers for
|
||||||
# chaincode. The external builder detection processing will iterate over the
|
# chaincode. The external builder detection processing will iterate over the
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue