From 8b54e14ee43d2f0c4eb7dce037d9197a385144c8 Mon Sep 17 00:00:00 2001 From: Brett Logan Date: Wed, 1 Jul 2020 16:16:54 -0400 Subject: [PATCH] Use Official CouchDB 3.1 Image Fabric 2.2 removes official support for CouchDB 2.x. The migration to 3.1 was to address fsync issues in the underlying storage implementation in Couch. This change moves to CouchDB 3.1 which requires the user to now set an admin identity at startup. Signed-off-by: Brett Logan --- ci/azure-pipelines.yml | 2 +- .../docker/docker-compose-couch-org3.yaml | 10 +++++----- test-network/docker/docker-compose-couch.yaml | 20 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index 7b809771..dc336a0e 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -7,7 +7,7 @@ trigger: - release-1.4 variables: - FABRIC_VERSION: 2.0 + FABRIC_VERSION: 2.2 NODE_VER: 12.x PATH: $(Build.Repository.LocalPath)/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin diff --git a/test-network/addOrg3/docker/docker-compose-couch-org3.yaml b/test-network/addOrg3/docker/docker-compose-couch-org3.yaml index 912b9a83..cad09f28 100644 --- a/test-network/addOrg3/docker/docker-compose-couch-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-couch-org3.yaml @@ -11,12 +11,12 @@ networks: services: couchdb4: container_name: couchdb4 - image: hyperledger/fabric-couchdb + image: couchdb:3.1 # Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password # for CouchDB. This will prevent CouchDB from operating in an "Admin Party" mode. environment: - - COUCHDB_USER= - - COUCHDB_PASSWORD= + - COUCHDB_USER=admin + - COUCHDB_PASSWORD=adminpw # Comment/Uncomment the port mapping if you want to hide/expose the CouchDB service, # for example map it to utilize Fauxton User Interface in dev environments. ports: @@ -31,8 +31,8 @@ services: # The CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME and CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD # provide the credentials for ledger to connect to CouchDB. The username and password must # match the username and password set for the associated CouchDB. - - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME= - - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD= + - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME=admin + - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=adminpw depends_on: - couchdb4 networks: diff --git a/test-network/docker/docker-compose-couch.yaml b/test-network/docker/docker-compose-couch.yaml index 85b14f7a..c0906fd0 100644 --- a/test-network/docker/docker-compose-couch.yaml +++ b/test-network/docker/docker-compose-couch.yaml @@ -11,12 +11,12 @@ networks: services: couchdb0: container_name: couchdb0 - image: hyperledger/fabric-couchdb + image: couchdb:3.1 # Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password # for CouchDB. This will prevent CouchDB from operating in an "Admin Party" mode. environment: - - COUCHDB_USER= - - COUCHDB_PASSWORD= + - COUCHDB_USER=admin + - COUCHDB_PASSWORD=adminpw # Comment/Uncomment the port mapping if you want to hide/expose the CouchDB service, # for example map it to utilize Fauxton User Interface in dev environments. ports: @@ -31,19 +31,19 @@ services: # The CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME and CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD # provide the credentials for ledger to connect to CouchDB. The username and password must # match the username and password set for the associated CouchDB. - - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME= - - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD= + - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME=admin + - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=adminpw depends_on: - couchdb0 couchdb1: container_name: couchdb1 - image: hyperledger/fabric-couchdb + image: couchdb:3.1 # Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password # for CouchDB. This will prevent CouchDB from operating in an "Admin Party" mode. environment: - - COUCHDB_USER= - - COUCHDB_PASSWORD= + - COUCHDB_USER=admin + - COUCHDB_PASSWORD=adminpw # Comment/Uncomment the port mapping if you want to hide/expose the CouchDB service, # for example map it to utilize Fauxton User Interface in dev environments. ports: @@ -58,7 +58,7 @@ services: # The CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME and CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD # provide the credentials for ledger to connect to CouchDB. The username and password must # match the username and password set for the associated CouchDB. - - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME= - - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD= + - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME=admin + - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=adminpw depends_on: - couchdb1