Rearrange use case enumeration in Docker tests

docker-test/uc2-docker-compose/docker-compose.yml

 version: '2'
 services:
   zookeeper:
+    #image: wurstmeister/zookeeper
     image: confluentinc/cp-zookeeper
-    expose:
-      - "9092"
+    ports:
+      - "2181:2181"
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
   kafka:
@@ -24,10 +25,10 @@ services:
     depends_on:
       - zookeeper
       - kafka
+    #ports:
+    #  - "8081:8081"
     expose:
       - "8081"
-    #ports:
-    #  - 8081:8081
     environment:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
@@ -39,6 +40,7 @@ services:
     environment:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
+      KAFKA_WINDOW_DURATION_MINUTES: 60
   uc-wg: 
     image: theodolite/theodolite-uc2-workload-generator:latest
     depends_on:
@@ -49,5 +51,4 @@ services:
       PORT: 5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
-      NUM_SENSORS: 4
-      NUM_NESTED_GROUPS: 4
+      NUM_SENSORS: 10
\ No newline at end of file

docker-test/uc3-docker-compose/docker-compose.yml

@@ -40,7 +40,6 @@ services:
     environment:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
-      KAFKA_WINDOW_DURATION_MINUTES: 60
   uc-wg: 
     image: theodolite/theodolite-uc3-workload-generator:latest
     depends_on:

docker-test/uc4-docker-compose/docker-compose.yml

 version: '2'
 services:
   zookeeper:
-    #image: wurstmeister/zookeeper
     image: confluentinc/cp-zookeeper
-    ports:
-      - "2181:2181"
+    expose:
+      - "2181"
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
   kafka:
@@ -25,10 +24,10 @@ services:
     depends_on:
       - zookeeper
       - kafka
-    #ports:
-    #  - "8081:8081"
     expose:
       - "8081"
+    #ports:
+    #  - 8081:8081
     environment:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
@@ -50,4 +49,5 @@ services:
       PORT: 5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
-      NUM_SENSORS: 10
+      NUM_SENSORS: 4
+      NUM_NESTED_GROUPS: 4
\ No newline at end of file