[FAB-3386] Remove fabric-testenv-orderer image

We need to make our examples/scripts work with production-level artifacts. The fabric-testenv-orderer image is not an artifact targeted for production. This abundance of options leads to user confusion (I've had folks ask me whether they need to use `fabric-testenv-orderer` to make Kafka work), and it also means we have yet another image we need to maintain. This changeset removes all references to the fabric-testenv-orderer Docker image. Change-Id: I19daa1a21b2ce15b299caa77ca1e59c7101cb553 Signed-off-by: Kostas Christidis <kostas@christidis.io>
hyperledger · May 9, 2017 · 9d1da95 · 9d1da95
1 parent db236d6
commit 9d1da95
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 67 deletions.
diff --git a/bddtests/docker-compose-orderer-kafka.yml b/bddtests/docker-compose-orderer-kafka.yml
@@ -18,7 +18,7 @@ services:
       - zookeeper
 
   orderer:
-    image: hyperledger/fabric-testenv-orderer
+    image: hyperledger/fabric-orderer
     restart: always
     environment:
       - ORDERER_GENERAL_LOGLEVEL=debug

diff --git a/bddtests/environments/orderer-1-kafka-1/docker-compose.yml b/bddtests/environments/orderer-1-kafka-1/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     image: hyperledger/fabric-zookeeper
 
   orderer0:
-    image: hyperledger/fabric-testenv-orderer
+    image: hyperledger/fabric-orderer
     environment:
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
       - ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka

diff --git a/bddtests/environments/orderer-1-kafka-3/docker-compose.yml b/bddtests/environments/orderer-1-kafka-3/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     image: hyperledger/fabric-zookeeper
 
   orderer0:
-    image: hyperledger/fabric-testenv-orderer
+    image: hyperledger/fabric-orderer
     environment:
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
       - ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka

diff --git a/bddtests/environments/orderer/Dockerfile b/bddtests/environments/orderer/Dockerfile
diff --git a/bddtests/environments/orderer/docker-compose.yml b/bddtests/environments/orderer/docker-compose.yml
diff --git a/bddtests/environments/orderer/docker-entrypoint.sh b/bddtests/environments/orderer/docker-entrypoint.sh
diff --git a/bddtests/orderer-3-kafka-1.yml b/bddtests/orderer-3-kafka-1.yml
@@ -3,7 +3,7 @@ services:
   orderer1:
     extends:
         service: orderer0
-    image: hyperledger/fabric-testenv-orderer
+    image: hyperledger/fabric-orderer
     environment:
       - ORDERER_GENERAL_LOCALMSPID=${ORDERER1_ORDERER_GENERAL_LOCALMSPID}
       - ORDERER_GENERAL_TLS_PRIVATEKEY=${ORDERER1_ORDERER_GENERAL_TLS_PRIVATEKEY}
@@ -16,7 +16,7 @@ services:
   orderer2:
     extends:
         service: orderer0
-    image: hyperledger/fabric-testenv-orderer
+    image: hyperledger/fabric-orderer
     environment:
       - ORDERER_GENERAL_LOCALMSPID=${ORDERER2_ORDERER_GENERAL_LOCALMSPID}
       - ORDERER_GENERAL_TLS_PRIVATEKEY=${ORDERER2_ORDERER_GENERAL_TLS_PRIVATEKEY}