Update the config variables in composition files

The variables in the docker compose files needed to
be updated to use the new/modified environment
variables.

Change-Id: Ia5c215164b01dd4995343933ce4cf7916d3f3c04
Signed-off-by: Latitia M Haskins <[email protected]>

Author: lhaskins

bddtests/docker-compose-orderer-base.yml

@@ -6,9 +6,17 @@ services:
         image: hyperledger/fabric-orderer
         environment:
             - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
+            - ORDERER_GENERAL_LISTENPORT=7050
             - ORDERER_GENERAL_LOGLEVEL=debug
+            - ORDERER_GENERAL_LEDGERTYPE=ram
             - ORDERER_GENERAL_GENESISMETHOD=${ORDERER_GENERAL_GENESISMETHOD}
+            #- ORDERER_GENERAL_GENESISMETHOD=provisional
             - ORDERER_GENERAL_GENESISFILE=${ORDERER_GENERAL_GENESISFILE}
+            - ORDERER_GENERAL_QUEUESIZE=1000
+            - ORDERER_GENERAL_MAXWINDOWSIZE=1000
+            - ORDERER_RAMLEDGER_HISTORY_SIZE=100
+            - ORDERER_GENERAL_BATCHSIZE=10
+            - ORDERER_GENERAL_BATCHTIMEOUT=10s
         volumes:
             - ./volumes/orderer:/var/hyperledger/bddtests/volumes/orderer
         working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
@@ -17,5 +25,4 @@ services:
           - '7050'
 
 volumes:
-
     orderer:

bddtests/docker-compose-orderer-kafka.yml

@@ -1,15 +1,37 @@
-kafka0:
-    image: kchristidis/kafka
+version: '2'
+
+services:
+  zookeeper:
+    image: hyperledger/fabric-zookeeper
+    restart: always
+
+  kafka1:
+    image: hyperledger/fabric-kafka
+    restart: always
     environment:
-        - ADVERTISED_PORT=9092
+      - KAFKA_BROKER_ID=0
+      - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
+      - KAFKA_DEFAULT_REPLICATION_FACTOR=1
+    ports:
+      - '9092'
+    depends_on:
+      - zookeeper
 
-orderer0:
-    extends:
-        file: docker-compose-orderer-base.yml
-        service: ordererBase
+  orderer:
+    image: hyperledger/fabric-testenv-orderer
+    restart: always
     environment:
-      - ORDERER_GENESIS_ORDERERTYPE=kafka
-      - ORDERER_KAFKA_BROKERS=[kafka0:9092]
-    links:
-        - kafka0
+      - ORDERER_GENERAL_LOGLEVEL=debug
+      - ORDERER_GENERAL_QUEUESIZE=1000
+      - CONFIGTX_ORDERER_ORDERERTYPE=kafka
+      - ORDERER_KAFKA_BROKERS=[kafka1:9092]
+      - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
+      - ORDERER_GENERAL_LISTENPORT=7050
+    ports:
+      - 7050:7050
     command: orderer
+    volumes:
+      - /etc/hyperledger/msp:/etc/hyperledger/msp
+    depends_on:
+      - zookeeper
+      - kafka1

bddtests/docker-compose-orderer-solo.yml

@@ -7,4 +7,4 @@ services:
             file: docker-compose-orderer-base.yml
             service: ordererBase
         environment:
-            - ORDERER_GENESIS_ORDERERTYPE=solo
+            - CONFIGTX_ORDERER_ORDERERTYPE=solo

bddtests/environments/orderer-1-kafka-1/docker-compose.yml

@@ -9,6 +9,7 @@ services:
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
       - ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka
       - CONFIGTX_ORDERER_KAFKA_BROKERS=[kafka0:9092]
+      - CONFIGTX_ORDERER_ORDERERTYPE=kafka
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
     command: orderer
     ports:

bddtests/environments/orderer-1-kafka-3/docker-compose.yml

@@ -9,6 +9,7 @@ services:
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
       - ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka
       - CONFIGTX_ORDERER_KAFKA_BROKERS=[kafka0:9092,kafka1:9092,kafka2:9092]
+      - CONFIGTX_ORDERER_ORDERERTYPE=kafka
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
     command: orderer
     ports:

bddtests/environments/orderer-n-kafka-n/docker-compose.yml

@@ -5,11 +5,15 @@ services:
 
   orderer:
     image: hyperledger/fabric-testenv-orderer
+    container_name: orderer
     environment:
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
       - ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka
+      - CONFIGTX_ORDERER_ORDERERTYPE=kafka
     ports:
       - '7050'
+    volumes:
+      - /etc/hyperledger/msp:/etc/hyperledger/msp
     depends_on:
       - zookeeper
       - kafka

bddtests/environments/orderer/docker-compose.yml

@@ -5,5 +5,6 @@ services:
     image: hyperledger/fabric-testenv-orderer
     environment:
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
+      - CONFIGTX_ORDERER_ORDERERTYPE=solo
     ports:
       - '7050'