diff --git a/Makefile b/Makefile index 7d5a0a02a7..e2184d3b68 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ FABRIC_SDK_EXTRA_GO_TAGS ?= FABRIC_SDK_POPULATE_VENDOR ?= true # Fabric tool versions (overridable) -FABRIC_TOOLS_VERSION ?= 1.0.3 +FABRIC_TOOLS_VERSION ?= 1.0.4 FABRIC_BASE_VERSION ?= 0.4.2 # Fabric base docker image (overridable) diff --git a/README.md b/README.md index 1cd97261a2..7b3571262e 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ You're good to go, happy coding! Check out the examples for usage demonstrations ### Examples - [E2E Test](test/integration/end_to_end_test.go) and [Base Test](test/integration/base_test_setup.go): Part of the E2E tests included with the Go SDK. -- [Dynamic Endorser Selection] (test/integration/sdk_provider_test.go) : An example that uses dynamic endorser selection (based on chaincode policy) +- [Dynamic Endorser Selection](test/integration/sdk_provider_test.go): An example that uses dynamic endorser selection (based on chaincode policy) - [CLI](https://github.com/securekey/fabric-examples/tree/master/fabric-cli/): An example CLI for Fabric built with the Go SDK. - More examples needed! @@ -37,7 +37,7 @@ You're good to go, happy coding! Check out the examples for usage demonstrations ### Compatibility -- fabric v1.0.1 & fabric-ca v1.0.1 +- fabric v1.0.4 & fabric-ca v1.0.4 - fabric-sdk-go: master:HEAD - fabric v1.0.0 & fabric-ca v1.0.0 - fabric-sdk-go: master:110bf21bf3ab0a9a084f46d9698e1daeeda68a59 @@ -64,7 +64,7 @@ If you want to contribute to the Go SDK, please run the test suite and submit pa You need: -- Go +- Go 1.9 - [Dep](https://github.com/golang/dep) - Make - Docker @@ -155,14 +155,14 @@ Alternatively you can build and run Fabric on your own box using the following c cd $GOPATH/src/github.com/hyperledger/ git clone https://github.com/hyperledger/fabric cd $GOPATH/src/github.com/hyperledger/fabric/ -git checkout v1.0.1 +git checkout v1.0.4 make docker # Build fabric-ca: cd $GOPATH/src/github.com/hyperledger/ git clone https://github.com/hyperledger/fabric-ca cd $GOPATH/src/github.com/hyperledger/fabric-ca/ -git checkout v1.0.1 +git checkout v1.0.4 make docker # Start fabric - latest-env.sh overrides the default docker tags in .env diff --git a/test/fixtures/.env b/test/fixtures/.env index 615e1598b5..0beb8afb25 100644 --- a/test/fixtures/.env +++ b/test/fixtures/.env @@ -14,11 +14,11 @@ ARCH=x86_64 CORE_PEER_NETWORKID=fabsdkgo COMPOSE_PROJECT_NAME=fabsdkgo -FABRIC_CA_FIXTURE_TAG=1.0.3 -FABRIC_ORDERER_FIXTURE_TAG=1.0.3 -FABRIC_PEER_FIXTURE_TAG=1.0.3 -FABRIC_COUCHDB_FIXTURE_TAG=1.0.3 -FABRIC_BUILDER_FIXTURE_TAG=1.0.3 +FABRIC_CA_FIXTURE_TAG=1.0.4 +FABRIC_ORDERER_FIXTURE_TAG=1.0.4 +FABRIC_PEER_FIXTURE_TAG=1.0.4 +FABRIC_COUCHDB_FIXTURE_TAG=1.0.4 +FABRIC_BUILDER_FIXTURE_TAG=1.0.4 FABRIC_BASEOS_FIXTURE_TAG=0.4.2 FABRIC_BASEIMAGE_FIXTURE_TAG=0.4.2