From 338bc57bffb5642d92456477b0ecc5d2629d789a Mon Sep 17 00:00:00 2001 From: Marcus Brandenburger Date: Thu, 25 Jul 2024 16:54:57 +0200 Subject: [PATCH] Bump fabric 2.5.9 Signed-off-by: Marcus Brandenburger --- README.md | 8 ++++---- config.mk | 4 ++-- fabric/README.md | 2 +- samples/chaincode/simple-asset-go/README.md | 2 +- samples/deployment/k8s/README.md | 2 +- .../k8s/orderer-service/orderer0-deployment.yaml | 2 +- .../k8s/orderer-service/orderer1-deployment.yaml | 2 +- .../k8s/orderer-service/orderer2-deployment.yaml | 2 +- samples/deployment/k8s/org1/org1-cli-deployment.yaml | 2 +- samples/deployment/k8s/org1/org1-peer0-deployment.yaml | 2 +- samples/deployment/k8s/org2/org2-cli-deployment.yaml | 2 +- samples/deployment/k8s/org2/org2-peer0-deployment.yaml | 2 +- samples/deployment/k8s/org3/org3-cli-deployment.yaml | 2 +- samples/deployment/k8s/org3/org3-peer0-deployment.yaml | 2 +- utils/docker/dev/Dockerfile | 2 +- utils/docker/dev_peer_cc-builder/Dockerfile | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index f288916c7..d0e68c800 100644 --- a/README.md +++ b/README.md @@ -292,7 +292,7 @@ Make sure that you have the following required dependencies installed: * [Intel Software Guard Extensions SSL](https://github.com/intel/intel-sgx-ssl) (we recommend using tag `3.0_Rev2` OpenSSL `3.0.12`) -* Hyperledger [Fabric](https://github.com/hyperledger/fabric/tree/v2.5.4) v2.5.4 +* Hyperledger [Fabric](https://github.com/hyperledger/fabric/tree/v2.5.9) v2.5.9 * Clang-format 6.x or higher @@ -349,15 +349,15 @@ export PROTOC_CMD=/usr/local/proto3/bin/protoc #### Hyperledger Fabric Our project fetches the latest supported Fabric binaries during the build process automatically. -However, if you want to use your own Fabric binaries, please checkout Fabric 2.5.4 release using the following commands: +However, if you want to use your own Fabric binaries, please checkout Fabric 2.5.9 release using the following commands: ```bash export FABRIC_PATH=$GOPATH/src/github.com/hyperledger/fabric git clone https://github.com/hyperledger/fabric.git $FABRIC_PATH -cd $FABRIC_PATH; git checkout tags/v2.5.4 +cd $FABRIC_PATH; git checkout tags/v2.5.9 ``` Note that Fabric Private Chaincode may not work with the Fabric `main` branch. -Therefore, make sure you use the Fabric `v2.5.4` tag. +Therefore, make sure you use the Fabric `v2.5.9` tag. Make sure the source of Fabric is in your `$GOPATH`. ## Build Fabric Private Chaincode diff --git a/config.mk b/config.mk index bb2c619d9..24e547a7a 100644 --- a/config.mk +++ b/config.mk @@ -62,8 +62,8 @@ PLANTUML_IMG_FORMAT ?= png # pdf / png / svg #-------------------------------------------------- PROJECT_NAME=fabric-private-chaincode -export FABRIC_VERSION ?= 2.5.4 -export FABRIC_CA_VERSION ?= 1.5.7 +export FABRIC_VERSION ?= 2.5.9 +export FABRIC_CA_VERSION ?= 1.5.12 export FPC_VERSION := main export FPC_CCENV_IMAGE ?= hyperledger/fabric-private-chaincode-ccenv:$(FPC_VERSION) diff --git a/fabric/README.md b/fabric/README.md index 84c4798f0..ef60e94bf 100644 --- a/fabric/README.md +++ b/fabric/README.md @@ -27,7 +27,7 @@ To clean the native build, type `cd $FPC_PATH/fabric; make clean-native`. ### Wrong Fabric version ``` Patching Fabric ... -Aborting! Tag on current HEAD () does not match expected tag/v2.5.4! +Aborting! Tag on current HEAD () does not match expected tag/v2.5.9! ... ``` diff --git a/samples/chaincode/simple-asset-go/README.md b/samples/chaincode/simple-asset-go/README.md index b2aa7585f..855e66a20 100644 --- a/samples/chaincode/simple-asset-go/README.md +++ b/samples/chaincode/simple-asset-go/README.md @@ -199,7 +199,7 @@ git clone https://github.com/hyperledger/fabric-samples cd $FPC_PATH/samples/deployment/test-network/fabric-samples # no we pick a specific version here to have stable experience :) git checkout -b "works" 98028c7 -curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.5.4 1.5.7 -s +curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.5.9 1.5.12 -s cd $FPC_PATH/samples/deployment/test-network ./setup.sh ``` diff --git a/samples/deployment/k8s/README.md b/samples/deployment/k8s/README.md index 40e14e39e..46c562a1a 100644 --- a/samples/deployment/k8s/README.md +++ b/samples/deployment/k8s/README.md @@ -124,7 +124,7 @@ If you have installed them somewhere else on your system, please set `FABIC_BIN_ For instance, you can download the binaries and use them by following the commands: ```bash cd $FPC_PATH/samples/deployment/k8s -curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.5.4 1.5.7 -d -s +curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.5.9 1.5.12 -d -s export FABRIC_BIN_DIR=$(pwd)/bin ``` diff --git a/samples/deployment/k8s/orderer-service/orderer0-deployment.yaml b/samples/deployment/k8s/orderer-service/orderer0-deployment.yaml index bad137d17..85858aeff 100644 --- a/samples/deployment/k8s/orderer-service/orderer0-deployment.yaml +++ b/samples/deployment/k8s/orderer-service/orderer0-deployment.yaml @@ -68,7 +68,7 @@ spec: value: /var/hyperledger/orderer/tls/server.key - name: ORDERER_GENERAL_CLUSTER_ROOTCAS value: "[/var/hyperledger/orderer/tls/ca.crt]" - image: hyperledger/fabric-orderer:2.5.4 + image: hyperledger/fabric-orderer:2.5.9 name: orderer ports: - containerPort: 7050 diff --git a/samples/deployment/k8s/orderer-service/orderer1-deployment.yaml b/samples/deployment/k8s/orderer-service/orderer1-deployment.yaml index f5aa6dce8..3d0afa483 100644 --- a/samples/deployment/k8s/orderer-service/orderer1-deployment.yaml +++ b/samples/deployment/k8s/orderer-service/orderer1-deployment.yaml @@ -68,7 +68,7 @@ spec: value: /var/hyperledger/orderer/tls/server.key - name: ORDERER_GENERAL_CLUSTER_ROOTCAS value: "[/var/hyperledger/orderer/tls/ca.crt]" - image: hyperledger/fabric-orderer:2.5.4 + image: hyperledger/fabric-orderer:2.5.9 name: orderer ports: - containerPort: 7050 diff --git a/samples/deployment/k8s/orderer-service/orderer2-deployment.yaml b/samples/deployment/k8s/orderer-service/orderer2-deployment.yaml index ac88cee6c..1b42160b2 100644 --- a/samples/deployment/k8s/orderer-service/orderer2-deployment.yaml +++ b/samples/deployment/k8s/orderer-service/orderer2-deployment.yaml @@ -68,7 +68,7 @@ spec: value: /var/hyperledger/orderer/tls/server.key - name: ORDERER_GENERAL_CLUSTER_ROOTCAS value: "[/var/hyperledger/orderer/tls/ca.crt]" - image: hyperledger/fabric-orderer:2.5.4 + image: hyperledger/fabric-orderer:2.5.9 name: orderer ports: - containerPort: 7050 diff --git a/samples/deployment/k8s/org1/org1-cli-deployment.yaml b/samples/deployment/k8s/org1/org1-cli-deployment.yaml index 48e0d7a5e..5f7636dd5 100644 --- a/samples/deployment/k8s/org1/org1-cli-deployment.yaml +++ b/samples/deployment/k8s/org1/org1-cli-deployment.yaml @@ -52,7 +52,7 @@ spec: configMapKeyRef: name: chaincode-config key: FPC_MRENCLAVE - image: hyperledger/fabric-tools:2.5.4 + image: hyperledger/fabric-tools:2.5.9 name: cli tty: true volumeMounts: diff --git a/samples/deployment/k8s/org1/org1-peer0-deployment.yaml b/samples/deployment/k8s/org1/org1-peer0-deployment.yaml index 4917d0b84..7e14f4c50 100644 --- a/samples/deployment/k8s/org1/org1-peer0-deployment.yaml +++ b/samples/deployment/k8s/org1/org1-peer0-deployment.yaml @@ -57,7 +57,7 @@ spec: value: 0.0.0.0:9443 - name: CORE_METRICS_PROVIDER value: prometheus - image: hyperledger/fabric-peer:2.5.4 + image: hyperledger/fabric-peer:2.5.9 name: peer0 ports: - containerPort: 7051 diff --git a/samples/deployment/k8s/org2/org2-cli-deployment.yaml b/samples/deployment/k8s/org2/org2-cli-deployment.yaml index 54009bf99..e92cb3e87 100644 --- a/samples/deployment/k8s/org2/org2-cli-deployment.yaml +++ b/samples/deployment/k8s/org2/org2-cli-deployment.yaml @@ -52,7 +52,7 @@ spec: configMapKeyRef: name: chaincode-config key: FPC_MRENCLAVE - image: hyperledger/fabric-tools:2.5.4 + image: hyperledger/fabric-tools:2.5.9 name: cli tty: true volumeMounts: diff --git a/samples/deployment/k8s/org2/org2-peer0-deployment.yaml b/samples/deployment/k8s/org2/org2-peer0-deployment.yaml index 48350a361..789992438 100644 --- a/samples/deployment/k8s/org2/org2-peer0-deployment.yaml +++ b/samples/deployment/k8s/org2/org2-peer0-deployment.yaml @@ -57,7 +57,7 @@ spec: value: 0.0.0.0:9443 - name: CORE_METRICS_PROVIDER value: prometheus - image: hyperledger/fabric-peer:2.5.4 + image: hyperledger/fabric-peer:2.5.9 name: peer0 ports: - containerPort: 7051 diff --git a/samples/deployment/k8s/org3/org3-cli-deployment.yaml b/samples/deployment/k8s/org3/org3-cli-deployment.yaml index 0bd0c9b33..ee9a8c422 100644 --- a/samples/deployment/k8s/org3/org3-cli-deployment.yaml +++ b/samples/deployment/k8s/org3/org3-cli-deployment.yaml @@ -52,7 +52,7 @@ spec: configMapKeyRef: name: chaincode-config key: FPC_MRENCLAVE - image: hyperledger/fabric-tools:2.5.4 + image: hyperledger/fabric-tools:2.5.9 name: cli tty: true volumeMounts: diff --git a/samples/deployment/k8s/org3/org3-peer0-deployment.yaml b/samples/deployment/k8s/org3/org3-peer0-deployment.yaml index c023ec91c..5a1bac23a 100644 --- a/samples/deployment/k8s/org3/org3-peer0-deployment.yaml +++ b/samples/deployment/k8s/org3/org3-peer0-deployment.yaml @@ -57,7 +57,7 @@ spec: value: 0.0.0.0:9443 - name: CORE_METRICS_PROVIDER value: prometheus - image: hyperledger/fabric-peer:2.5.4 + image: hyperledger/fabric-peer:2.5.9 name: peer0 ports: - containerPort: 7051 diff --git a/utils/docker/dev/Dockerfile b/utils/docker/dev/Dockerfile index ca07c1dd8..c6751fe1a 100644 --- a/utils/docker/dev/Dockerfile +++ b/utils/docker/dev/Dockerfile @@ -23,7 +23,7 @@ FROM hyperledger/fabric-private-chaincode-base-dev:${FPC_VERSION} # config/build params ARG FABRIC_REPO=https://github.com/hyperledger/fabric.git -ARG FABRIC_VERSION=2.5.4 +ARG FABRIC_VERSION=2.5.9 ARG FABRIC_REL_PATH=src/github.com/hyperledger/fabric ARG FPC_REL_PATH=src/github.com/hyperledger/fabric-private-chaincode diff --git a/utils/docker/dev_peer_cc-builder/Dockerfile b/utils/docker/dev_peer_cc-builder/Dockerfile index 59bb4367b..27f642be0 100644 --- a/utils/docker/dev_peer_cc-builder/Dockerfile +++ b/utils/docker/dev_peer_cc-builder/Dockerfile @@ -53,7 +53,7 @@ ARG SGX_MODE # config/build params ARG FABRIC_REPO=https://github.com/hyperledger/fabric.git -ARG FABRIC_VERSION=2.5.4 +ARG FABRIC_VERSION=2.5.9 ARG FPC_REPO_URL=https://github.com/hyperledger/fabric-private-chaincode.git ARG FPC_REPO_BRANCH_TAG_OR_COMMIT=main ARG GIT_USER_NAME=tester