Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update microfab #360

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Update microfab #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...code-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ public Peer build(Map<String,String> 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");
Expand Down
4 changes: 2 additions & 2 deletions fabric-chaincode-integration-test/src/test/resources/docker-compose-microfab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down