chore(examples): update versions in discounted-asset-trade example

This updates the versions in the discounted-asset-trade example to ensure compatibility and proper functionality. The Fabric version was upgraded from 2.4.4 to 2.5.6 as the internal image being used required v2_5 capability. Additionally, as per the Hyperledger Fabric documentation (https://hyperledger-fabric.readthedocs.io/en/release-2.5/prereqs.html), Go version 1.22.4 is needed for the example to work in its entirety. Signed-off-by: Rajat Sharma <[email protected]>
hyperledger · Jun 26, 2024 · 2312612 · 2312612
1 parent 0b0c22c
commit 2312612
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/examples/cactus-example-discounted-asset-trade/script-start-ledgers.sh b/examples/cactus-example-discounted-asset-trade/script-start-ledgers.sh
@@ -10,8 +10,8 @@ CONFIG_VOLUME_PATH="./etc/cactus" # Docker volume with shared configuration
 
 # Fabric Env Variables
 export CACTUS_FABRIC_ALL_IN_ONE_CONTAINER_NAME="asset_trade_faio2x_testnet"
-export CACTUS_FABRIC_ALL_IN_ONE_VERSION="2.4.4"
-export CACTUS_FABRIC_ALL_IN_ONE_NODEENV_VERSION="2.4.2"
+export CACTUS_FABRIC_ALL_IN_ONE_VERSION="2.5.6"
+export CACTUS_FABRIC_ALL_IN_ONE_NODEENV_VERSION="2.5.4"
 export CACTUS_FABRIC_ALL_IN_ONE_CA_VERSION="1.5.3"
 export CACTUS_FABRIC_ALL_IN_ONE_COUCH_VERSION_FABRIC="0.4"
 export CACTUS_FABRIC_ALL_IN_ONE_COUCH_VERSION="3.2.2"
@@ -172,4 +172,4 @@ function start_ledgers() {
 }
 
 start_ledgers
-echo "All Done."
+echo "All Done."
diff --git a/tools/docker/fabric-all-in-one/Dockerfile_v2.x b/tools/docker/fabric-all-in-one/Dockerfile_v2.x
@@ -32,13 +32,13 @@ RUN apk add --no-cache npm nodejs
 RUN apk add --no-cache yq
 
 # Download and setup path variables for Go
-RUN wget https://golang.org/dl/go1.20.6.linux-amd64.tar.gz
-RUN tar -xvf go1.20.6.linux-amd64.tar.gz
+RUN wget https://golang.org/dl/go1.22.4.linux-amd64.tar.gz
+RUN tar -xvf go1.22.4.linux-amd64.tar.gz
 RUN mv go /usr/local
 ENV GOROOT=/usr/local/go
 ENV GOPATH=/usr/local/go
 ENV PATH=$PATH:$GOPATH/bin
-RUN rm go1.20.6.linux-amd64.tar.gz
+RUN rm go1.22.4.linux-amd64.tar.gz
 
 # Needed as of as of go v1.20
 # @see https://github.com/golang/go/issues/59305#issuecomment-1488478737

diff --git a/tools/docker/fabric-all-in-one/docker-compose-v2.x.yml b/tools/docker/fabric-all-in-one/docker-compose-v2.x.yml
@@ -17,8 +17,8 @@ services:
       - "8054:8054" # ca_org2
       - "9054:9054" # ca_orderer
     environment:
-      - FABRIC_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_VERSION:-2.4.4}
-      - FABRIC_NODEENV_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_NODEENV_VERSION:-2.4.2}
+      - FABRIC_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_VERSION:-2.5.6}
+      - FABRIC_NODEENV_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_NODEENV_VERSION:-2.5.4}
       - CA_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_CA_VERSION:-1.5.3}
       - COUCH_VERSION_FABRIC=${CACTUS_FABRIC_ALL_IN_ONE_COUCH_VERSION_FABRIC:-0.4}
       - COUCH_VERSION=${CACTUS_FABRIC_ALL_IN_ONE_COUCH_VERSION:-3.2.2}