Skip to content

Commit

Permalink
[FABG-979] Update stable target to Fabric 2.2.0 (#98)
Browse files Browse the repository at this point in the history
Signed-off-by: Troy Ronda <troy@troyronda.com>
  • Loading branch information
troyronda committed Jul 15, 2020
1 parent b9dcc01 commit 87f5eb8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -25,8 +25,8 @@ DOCKER_CMD ?= docker
DOCKER_COMPOSE_CMD ?= docker-compose

# Fabric versions used in the Makefile
FABRIC_STABLE_VERSION := 2.1.1
FABRIC_STABLE_VERSION_MINOR := 2.1
FABRIC_STABLE_VERSION := 2.2.0
FABRIC_STABLE_VERSION_MINOR := 2.2
FABRIC_STABLE_VERSION_MAJOR := 2

FABRIC_PRERELEASE_VERSION :=
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -48,7 +48,7 @@ If you wish to use the Fabric 'Gateway' programming model, then the API is in th
### Current Compatibility
The SDK's integration tests run against three tagged Fabric versions:
- prev (currently v1.4.7)
- stable (currently v2.1.1)
- stable (currently v2.2.0)
- prerelease (currently disabled)

Additionally for development purposes integration tests also run against the devstable Fabric version as needed.
Expand Down
14 changes: 7 additions & 7 deletions test/fixtures/dockerenv/.env
Expand Up @@ -18,16 +18,16 @@ COMPOSE_PROJECT_NAME=fabsdkgo
FABRIC_DOCKER_REGISTRY=
FABRIC_BASE_DOCKER_REGISTRY=

FABRIC_FIXTURE_VERSION=v2.1
FABRIC_FIXTURE_VERSION=v2.2
FABRIC_CRYPTOCONFIG_VERSION=v2

FABRIC_CA_FIXTURE_TAG=1.4.7
FABRIC_ORDERER_FIXTURE_TAG=2.1.1
FABRIC_PEER_FIXTURE_TAG=2.1.1
FABRIC_BUILDER_FIXTURE_TAG=2.1.1
FABRIC_COUCHDB_FIXTURE_TAG=0.4.20
FABRIC_BASEOS_FIXTURE_TAG=2.1.1
FABRIC_BASEIMAGE_FIXTURE_TAG=0.4.20
FABRIC_ORDERER_FIXTURE_TAG=2.2.0
FABRIC_PEER_FIXTURE_TAG=2.2.0
FABRIC_BUILDER_FIXTURE_TAG=2.2.0
FABRIC_COUCHDB_FIXTURE_TAG=0.4.21
FABRIC_BASEOS_FIXTURE_TAG=2.2.0
FABRIC_BASEIMAGE_FIXTURE_TAG=0.4.21

FABRIC_CA_FIXTURE_IMAGE=hyperledger/fabric-ca
FABRIC_ORDERER_FIXTURE_IMAGE=hyperledger/fabric-orderer
Expand Down

0 comments on commit 87f5eb8

Please sign in to comment.