Skip to content

Commit

Permalink
Use Official CouchDB 3.1 Image (#180)
Browse files Browse the repository at this point in the history
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 <brett.t.logan@ibm.com>
  • Loading branch information
Brett Logan authored Jul 2, 2020
1 parent 88c0a78 commit 8380560
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ci/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ variables:
- name: node_version_spec
value: '12.15.0'
- name: FABRIC_VERSION
value: 2.1
value: 2.2

# Build on Ubuntu
pool:
Expand Down
4 changes: 2 additions & 2 deletions tools/getEdgeDocker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
set -euo pipefail

version=${FABRIC_VERSION:-2.1}
version=${FABRIC_VERSION:-2.2}
artifactory_url=hyperledger-fabric.jfrog.io

for image in peer orderer ca baseos ccenv tools; do
Expand All @@ -16,7 +16,7 @@ for image in peer orderer ca baseos ccenv tools; do
docker rmi -f "${artifactory_image}" >/dev/null
done

docker pull -q hyperledger/fabric-couchdb
docker pull -q couchdb:3.1
docker pull -q hyperledger/fabric-ca:1.4
docker tag hyperledger/fabric-ca:1.4 hyperledger/fabric-ca
docker rmi hyperledger/fabric-ca:1.4 >/dev/null
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ services:
- CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv
# Allow more time for chaincode container to build on install.
- CORE_CHAINCODE_EXECUTETIMEOUT=300s

- CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME=admin
- CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=adminpw
working_dir: /opt/gopath/src/github.com/hyperledger/fabric
command: peer node start --peer-chaincodedev=true
volumes:
Expand Down Expand Up @@ -129,4 +132,7 @@ services:

couchdb:
container_name: couchdb
image: hyperledger/fabric-couchdb
image: couchdb:3.1
environment:
- COUCHDB_USER=admin
- COUCHDB_PASSWORD=adminpw

0 comments on commit 8380560

Please sign in to comment.