Skip to content

Commit 8380560

Browse files
author
Brett Logan
authored
Use Official CouchDB 3.1 Image (#180)
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>
1 parent 88c0a78 commit 8380560

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

ci/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ variables:
4343
- name: node_version_spec
4444
value: '12.15.0'
4545
- name: FABRIC_VERSION
46-
value: 2.1
46+
value: 2.2
4747

4848
# Build on Ubuntu
4949
pool:

tools/getEdgeDocker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
set -euo pipefail
88

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

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

19-
docker pull -q hyperledger/fabric-couchdb
19+
docker pull -q couchdb:3.1
2020
docker pull -q hyperledger/fabric-ca:1.4
2121
docker tag hyperledger/fabric-ca:1.4 hyperledger/fabric-ca
2222
docker rmi hyperledger/fabric-ca:1.4 >/dev/null

tools/toolchain/network/docker-compose/docker-compose-base.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ services:
9595
- CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv
9696
# Allow more time for chaincode container to build on install.
9797
- CORE_CHAINCODE_EXECUTETIMEOUT=300s
98+
99+
- CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME=admin
100+
- CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=adminpw
98101
working_dir: /opt/gopath/src/github.com/hyperledger/fabric
99102
command: peer node start --peer-chaincodedev=true
100103
volumes:
@@ -129,4 +132,7 @@ services:
129132

130133
couchdb:
131134
container_name: couchdb
132-
image: hyperledger/fabric-couchdb
135+
image: couchdb:3.1
136+
environment:
137+
- COUCHDB_USER=admin
138+
- COUCHDB_PASSWORD=adminpw

0 commit comments

Comments
 (0)