[FAB-1366] Update Docker Compose files for Kafka

https://jira.hyperledger.org/browse/FAB-1366

We should either list only those ENV vars where we need to modify the
default values, or list all possible ENV vars to allow for easy editing
later on.

The Docker Compose files in their present form adopt a middle-ground
solution: list only some ENV vars, and have several of them set to the
default values.

This changeset goes all in on option 2 and lists all available ENV vars.

Change-Id: I408700ae07cb7416a1fa23c9c21068e9d89028d2
Signed-off-by: Kostas Christidis <kostas@christidis.io>

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

@@ -7,13 +7,16 @@ services:
   orderer0:
     image: hyperledger/fabric-orderer
     environment:
+        - ORDERER_GENERAL_ORDERERTYPE=kafka
         - ORDERER_GENERAL_LEDGERTYPE=ram
         - ORDERER_GENERAL_BATCHTIMEOUT=10s
         - ORDERER_GENERAL_BATCHSIZE=10
+        - ORDERER_GENERAL_QUEUESIZE=1000
         - ORDERER_GENERAL_MAXWINDOWSIZE=1000
         - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
+        - ORDERER_GENERAL_LISTENPORT=7050
+        - ORDERER_GENERAL_GENESISMETHOD=provisional
         - ORDERER_RAMLEDGER_HISTORY_SIZE=100
-        - ORDERER_GENERAL_ORDERERTYPE=kafka
         - ORDERER_KAFKA_BROKERS=[kafka0:9092]
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
     command: orderer

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

@@ -7,13 +7,16 @@ services:
   orderer0:
     image: hyperledger/fabric-orderer
     environment:
+      - ORDERER_GENERAL_ORDERERTYPE=kafka
       - ORDERER_GENERAL_LEDGERTYPE=ram
       - ORDERER_GENERAL_BATCHTIMEOUT=10s
       - ORDERER_GENERAL_BATCHSIZE=10
+      - ORDERER_GENERAL_QUEUESIZE=1000
       - ORDERER_GENERAL_MAXWINDOWSIZE=1000
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
+      - ORDERER_GENERAL_LISTENPORT=7050
+      - ORDERER_GENERAL_GENESISMETHOD=provisional
       - ORDERER_RAMLEDGER_HISTORY_SIZE=100
-      - ORDERER_GENERAL_ORDERERTYPE=kafka
       - ORDERER_KAFKA_BROKERS=[kafka0:9092,kafka1:9092,kafka2:9092]
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
     command: orderer

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

@@ -8,6 +8,15 @@ services:
     build: ./orderer
     environment:
       - ORDERER_GENERAL_ORDERERTYPE=kafka
+      - ORDERER_GENERAL_LEDGERTYPE=ram
+      - ORDERER_GENERAL_BATCHTIMEOUT=10s
+      - ORDERER_GENERAL_BATCHSIZE=10
+      - ORDERER_GENERAL_QUEUESIZE=1000
+      - ORDERER_GENERAL_MAXWINDOWSIZE=1000
+      - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
+      - ORDERER_GENERAL_LISTENPORT=7050
+      - ORDERER_GENERAL_GENESISMETHOD=provisional
+      - ORDERER_RAMLEDGER_HISTORY_SIZE=100
     depends_on:
       - zookeeper
       - kafka

bddtests/environments/orderer-n-kafka-n/orderer/Dockerfile

@@ -1,13 +1,5 @@
 FROM hyperledger/fabric-orderer
-ENV ORDERER_GENERAL_LEDGERTYPE=ram \
-    ORDERER_GENERAL_BATCHTIMEOUT=10s \
-    ORDERER_GENERAL_BATCHSIZE=10 \
-    ORDERER_GENERAL_MAXWINDOWSIZE=1000 \
-    ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 \
-    ORDERER_GENERAL_LISTENPORT=5005 \
-    ORDERER_RAMLEDGER_HISTORY_SIZE=100
 WORKDIR /opt/gopath/src/github.com/hyperledger/fabric/orderer
-ENV ORDERER_GENERAL_ORDERERTYPE=kafka
 RUN apt-get update \
     && apt-get install -y zookeeper jq \
     && rm -rf /var/lib/apt/lists/*