From 5c020f2a71c4c0c5c963d4094806bf7532b6661b Mon Sep 17 00:00:00 2001 From: Tatsuya Sato Date: Wed, 10 May 2023 07:17:13 +0000 Subject: [PATCH] Update FSAT to use Fabric 2.5 by default This patch updates full-stack-asset-transfer to Fabric 2.5 by default. In particular, since k8s-builder-peer is set as the default value for peer image, it needs to be updated to use 0.11.0, which is derived from Fabric v2.5 image, as the version default value. Signed-off-by: Tatsuya Sato --- full-stack-asset-transfer-guide/SETUP.md | 4 ++-- .../infrastructure/sample-network/network | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/full-stack-asset-transfer-guide/SETUP.md b/full-stack-asset-transfer-guide/SETUP.md index 40a84671..4f8f0d2d 100644 --- a/full-stack-asset-transfer-guide/SETUP.md +++ b/full-stack-asset-transfer-guide/SETUP.md @@ -3,8 +3,8 @@ Remember to clone this repository! ```shell -git clone https://github.com/hyperledgendary/full-stack-asset-transfer-guide.git workshop -cd workshop +git clone https://github.com/hyperledger/fabric-samples.git fabric-samples +cd fabric-samples/full-stack-asset-transfer-guide export WORKSHOP_PATH=$(pwd) ``` diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/network b/full-stack-asset-transfer-guide/infrastructure/sample-network/network index 00f00c72..8b0fe203 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.0-beta2 -context FABRIC_CA_VERSION 1.5.5 +context FABRIC_VERSION 2.5.1 +context FABRIC_CA_VERSION 1.5.6 context CLUSTER_RUNTIME kind # or k3s for Rancher context CONTAINER_CLI docker # or nerdctl for containerd @@ -77,8 +77,8 @@ context CA_IMAGE_LABEL ${FABRIC_CA_VERSION} # todo: use ghcr.io fabric-peer when k8s-builder is automatically deployed by the operator #context PEER_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-peer #context PEER_IMAGE_LABEL ${FABRIC_VERSION} -context PEER_IMAGE ghcr.io/hyperledger-labs/k8s-fabric-peer -context PEER_IMAGE_LABEL v0.8.0 +context PEER_IMAGE ghcr.io/hyperledger-labs/fabric-builder-k8s/k8s-fabric-peer +context PEER_IMAGE_LABEL 0.11.0 # When using k8s-fabric-peer in Fabric v2.5+, 0.11.0+ should be specified context ORDERER_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-orderer context ORDERER_IMAGE_LABEL ${FABRIC_VERSION} context TOOLS_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-tools