[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 <[email protected]>
hyperledger · Feb 28, 2018 · e73a481 · e73a481
1 parent 9986510
commit e73a481
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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: