Test using Fabric v2.5 images (#575)

v2.5 development peer images were already used but now all v2.5 release images can be used. Signed-off-by: Mark S. Lewis <[email protected]>
hyperledger · May 2, 2023 · 4245d80 · 4245d80
1 parent 5d478c4
commit 4245d80
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ export PEER_IMAGE_TAG ?= 2.5
 
 # TWO_DIGIT_VERSION specifies which chaincode images to pull, they will be tagged to be consistent with PEER_IMAGE_TAG
 # In fabric-gateway main branch it should typically be the latest released chaincode version available in dockerhub.
-TWO_DIGIT_VERSION ?= 2.4
+TWO_DIGIT_VERSION ?= 2.5
 
 export SOFTHSM2_CONF ?= $(base_dir)/softhsm2.conf
 TMPDIR ?= /tmp
@@ -224,7 +224,7 @@ pull-latest-peer:
 	docker tag $(PEER_IMAGE_PULL) hyperledger/fabric-peer:$(PEER_IMAGE_TAG)
 	# also need to retag the following images for the chaincode builder
 	for IMAGE in baseos ccenv javaenv nodeenv; do \
-		docker pull hyperledger/fabric-$${IMAGE}:$(TWO_DIGIT_VERSION) || docker pull --platform amd64 hyperledger/fabric-$${IMAGE}:$(TWO_DIGIT_VERSION); \
+		docker pull hyperledger/fabric-$${IMAGE}:$(TWO_DIGIT_VERSION); \
 		docker tag hyperledger/fabric-$${IMAGE}:$(TWO_DIGIT_VERSION) hyperledger/fabric-$${IMAGE}:$(PEER_IMAGE_TAG); \
 	done
 

diff --git a/java/README.md b/java/README.md
@@ -42,6 +42,6 @@ implementation 'org.hyperledger.fabric:fabric-gateway:1.1.0'
 
 ## Compatibility
 
-This API requires Fabric 2.4 with a Gateway enabled Peer. Additional compatibility information is available in the documentation:
+This API requires Fabric v2.4 (or later) with a Gateway enabled Peer. Additional compatibility information is available in the documentation:
 
 - https://hyperledger.github.io/fabric-gateway/
diff --git a/node/README.md b/node/README.md
@@ -27,6 +27,6 @@ npm install @hyperledger/fabric-gateway
 
 ## Compatibility
 
-This API requires Fabric 2.4 with a Gateway enabled Peer. Additional compatibility information is available in the documentation:
+This API requires Fabric v2.4 (or later) with a Gateway enabled Peer. Additional compatibility information is available in the documentation:
 
 - https://hyperledger.github.io/fabric-gateway/
diff --git a/pkg/client/README.md b/pkg/client/README.md
@@ -26,6 +26,6 @@ go get github.com/hyperledger/fabric-gateway
 
 ## Compatibility
 
-This API requires Fabric 2.4 with a Gateway enabled Peer. Additional compatibility information is available in the documentation:
+This API requires Fabric v2.4 (or later) with a Gateway enabled Peer. Additional compatibility information is available in the documentation:
 
 - https://hyperledger.github.io/fabric-gateway/
diff --git a/scenario/fixtures/chaincode/golang/basic/go.mod b/scenario/fixtures/chaincode/golang/basic/go.mod
@@ -1,6 +1,6 @@
 module github.com/hyperledger/fabric-gateway/scenario/fixtures/chaincode/go/basic
 
-go 1.19
+go 1.20
 
 require github.com/hyperledger/fabric-contract-api-go v1.2.1
 

diff --git a/scenario/fixtures/chaincode/golang/private/go.mod b/scenario/fixtures/chaincode/golang/private/go.mod
@@ -1,6 +1,6 @@
 module github.com/hyperledger/fabric-gateway/scenario/fixtures/chaincode/go/private
 
-go 1.19
+go 1.20
 
 require (
 	github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a

diff --git a/scenario/fixtures/chaincode/node/errors/package.json b/scenario/fixtures/chaincode/node/errors/package.json
@@ -10,7 +10,7 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
-        "fabric-contract-api": "^2.4.0",
-        "fabric-shim": "^2.4.0"
+        "fabric-contract-api": "^2.5.3",
+        "fabric-shim": "^2.5.3"
     }
-}
+}
diff --git a/scenario/fixtures/crypto-material/configtx.yaml b/scenario/fixtures/crypto-material/configtx.yaml
@@ -51,7 +51,7 @@ Capabilities:
     # safely manipulated without concern for upgrading orderers.  Set the value
     # of the capability to true to require it.
     Application: &ApplicationCapabilities
-        V2_0: true
+        V2_5: true
 ################################################################################
 #
 #   CHANNEL

diff --git a/scenario/fixtures/docker-compose/.env b/scenario/fixtures/docker-compose/.env
@@ -1,7 +1,7 @@
 # Environment variables will be overridden if set in user environment or Makefile.
 # Typically we'll want to test with the latest released orderer and tools images from dockerhub, but latest unreleased peer image that has been pulled and tagged
-ORDERER_IMAGE_TAG=2.4
-TOOLS_IMAGE_TAG=2.4
+ORDERER_IMAGE_TAG=2.5
+TOOLS_IMAGE_TAG=2.5
 PEER_IMAGE_TAG=2.5
 FABRIC_CA_IMAGE_TAG=1.5
 DOCKER_DEBUG=info:dockercontroller,gateway=debug

diff --git a/scenario/fixtures/generate.sh b/scenario/fixtures/generate.sh
@@ -12,6 +12,6 @@ docker exec cli rm -rf /etc/hyperledger/config/channel.tx \
     /etc/hyperledger/config/crypto-config
 docker exec cli cryptogen generate --config=/etc/hyperledger/config/crypto-config.yaml --output /etc/hyperledger/config/crypto-config
 docker exec cli configtxgen -profile ThreeOrgsApplicationGenesis -outputBlock /etc/hyperledger/config/mychannel.block -channelID mychannel
-docker exec cli cp /etc/hyperledger/fabric/core.yaml /etc/hyperledger/config
+docker exec cli cp /var/hyperledger/fabric/config/core.yaml /etc/hyperledger/config
 docker exec cli /etc/hyperledger/config/rename_sk.sh
 docker-compose -f docker-compose-cli.yaml down --volumes