From d5aa6c5e21bba289b7cfe72245fa13f49e56c585 Mon Sep 17 00:00:00 2001 From: "Mark S. Lewis" Date: Fri, 25 Oct 2024 04:32:19 +0100 Subject: [PATCH] Update microfab (#360) Update microfab used for integration tests from ibmcom/ibp-microfab to use ghcr.io/hyperledger-labs/microfab. This updates the Fabric runtime for v2.4 to v2.5. Signed-off-by: Mark S. Lewis --- .../org/hyperleder/fabric/shim/integration/util/Peer.java | 2 ++ .../src/test/resources/docker-compose-microfab.yaml | 4 ++-- .../src/test/resources/scripts/mfsetup.sh | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java index 65f045b3..dbbc53ad 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java @@ -146,6 +146,8 @@ public Peer build(Map additionalEnv) { list.add("--waitForEvent"); } + list.add("--orderer"); + list.add("orderer-api.127-0-0-1.nip.io:8080"); list.add("--peerAddresses"); list.add("org1peer-api.127-0-0-1.nip.io:8080"); list.add("--peerAddresses"); diff --git a/fabric-chaincode-integration-test/src/test/resources/docker-compose-microfab.yaml b/fabric-chaincode-integration-test/src/test/resources/docker-compose-microfab.yaml index 1139861b..79dfc2d7 100644 --- a/fabric-chaincode-integration-test/src/test/resources/docker-compose-microfab.yaml +++ b/fabric-chaincode-integration-test/src/test/resources/docker-compose-microfab.yaml @@ -9,10 +9,10 @@ services: microfab: container_name: microfab - image: ibmcom/ibp-microfab + image: ghcr.io/hyperledger-labs/microfab tty: true environment: - - MICROFAB_CONFIG={"couchdb":false,"endorsing_organizations":[{"name":"org1"},{"name":"org2"}],"channels":[{"name":"sachannel","endorsing_organizations":["org1","org2"]}],"capability_level":"V2_0"} + - MICROFAB_CONFIG={"couchdb":false,"endorsing_organizations":[{"name":"org1"},{"name":"org2"}],"channels":[{"name":"sachannel","endorsing_organizations":["org1","org2"]}],"capability_level":"V2_5"} - FABRIC_LOGGING_SPEC=info ports: - 8080:8080 diff --git a/fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh b/fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh index bfed2332..6d03c869 100755 --- a/fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh +++ b/fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh @@ -11,7 +11,7 @@ mkdir -p "${CFG}" # using the IBM tagged version until labs workflow is updated docker rm -f microfab || true -export MICROFAB_CONFIG='{"couchdb":false,"endorsing_organizations":[{"name":"org1"},{"name":"org2"}],"channels":[{"name":"sachannel","endorsing_organizations":["org1","org2"]}],"capability_level":"V2_0"}' +export MICROFAB_CONFIG='{"couchdb":false,"endorsing_organizations":[{"name":"org1"},{"name":"org2"}],"channels":[{"name":"sachannel","endorsing_organizations":["org1","org2"]}],"capability_level":"V2_5"}' docker run --name microfab \ -d \ @@ -20,7 +20,7 @@ docker run --name microfab \ --rm \ -e MICROFAB_CONFIG="${MICROFAB_CONFIG}" \ -e FABRIC_LOGGING_SPEC=info \ - ibmcom/ibp-microfab + ghcr.io/hyperledger-labs/microfab sleep 10