From e73a4813ba8fa77dd1c767a5c4adf5117876e3ed Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Wed, 28 Feb 2018 03:41:02 -0500 Subject: [PATCH] [FAB-8568] BYFN: Fix IMAGE_TAG for couchdb As of 1.1 alpha timeframe, 3rd party images do not follow the same docker IMAGE_TAG versioning as the other Fabric docker images. Need to remove IMAGE_TAG from couchdb images, and default to latest couchdb image, which is how it worked prior to the -i introduction. This change needs to be made in master branch but not release branch, since the IMAGE_TAGs are aligned in 1.0.x release. Change-Id: Iaca24ea7ed1fc6319738dcf59f665da9259d2b9a Signed-off-by: David Enyeart --- first-network/docker-compose-couch-org3.yaml | 4 ++-- first-network/docker-compose-couch.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/first-network/docker-compose-couch-org3.yaml b/first-network/docker-compose-couch-org3.yaml index 4208aa41..03e57ac8 100644 --- a/first-network/docker-compose-couch-org3.yaml +++ b/first-network/docker-compose-couch-org3.yaml @@ -11,7 +11,7 @@ networks: services: couchdb4: container_name: couchdb4 - image: hyperledger/fabric-couchdb:$IMAGE_TAG + image: hyperledger/fabric-couchdb # 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: @@ -38,7 +38,7 @@ services: couchdb5: container_name: couchdb5 - image: hyperledger/fabric-couchdb:$IMAGE_TAG + image: hyperledger/fabric-couchdb # 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: diff --git a/first-network/docker-compose-couch.yaml b/first-network/docker-compose-couch.yaml index 99203191..b14c7f5c 100644 --- a/first-network/docker-compose-couch.yaml +++ b/first-network/docker-compose-couch.yaml @@ -11,7 +11,7 @@ networks: services: couchdb0: container_name: couchdb0 - image: hyperledger/fabric-couchdb:$IMAGE_TAG + image: hyperledger/fabric-couchdb # 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: @@ -38,7 +38,7 @@ services: couchdb1: container_name: couchdb1 - image: hyperledger/fabric-couchdb:$IMAGE_TAG + image: hyperledger/fabric-couchdb # 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: @@ -65,7 +65,7 @@ services: couchdb2: container_name: couchdb2 - image: hyperledger/fabric-couchdb:$IMAGE_TAG + image: hyperledger/fabric-couchdb # 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: @@ -92,7 +92,7 @@ services: couchdb3: container_name: couchdb3 - image: hyperledger/fabric-couchdb:$IMAGE_TAG + image: hyperledger/fabric-couchdb # 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: