Merge pull request #6811 from smatvienko-tb/docker-compose-zookeeper-upgrade-3.8.0

[3.4] Docker compose bump zookeeper version up to 3.8.0

docker/docker-compose.aws-sqs.yml

@@ -23,59 +23,33 @@ services:
   tb-core1:
     env_file:
       - queue-aws-sqs.env
-    depends_on:
-      - zookeeper
-      - redis
   tb-core2:
     env_file:
       - queue-aws-sqs.env
-    depends_on:
-      - zookeeper
-      - redis
   tb-rule-engine1:
     env_file:
       - queue-aws-sqs.env
-    depends_on:
-      - zookeeper
-      - redis
   tb-rule-engine2:
     env_file:
       - queue-aws-sqs.env
-    depends_on:
-      - zookeeper
-      - redis
   tb-mqtt-transport1:
     env_file:
       - queue-aws-sqs.env
-    depends_on:
-      - zookeeper
   tb-mqtt-transport2:
     env_file:
       - queue-aws-sqs.env
-    depends_on:
-      - zookeeper
   tb-http-transport1:
     env_file:
       - queue-aws-sqs.env
-    depends_on:
-      - zookeeper
   tb-http-transport2:
     env_file:
       - queue-aws-sqs.env
-    depends_on:
-      - zookeeper
   tb-coap-transport:
     env_file:
       - queue-aws-sqs.env
-    depends_on:
-      - zookeeper
   tb-lwm2m-transport:
     env_file:
       - queue-aws-sqs.env
-    depends_on:
-      - zookeeper
   tb-snmp-transport:
     env_file:
       - queue-aws-sqs.env
-    depends_on:
-      - zookeeper

docker/docker-compose.confluent.yml

@@ -23,23 +23,15 @@ services:
   tb-core1:
     env_file:
       - queue-confluent.env
-    depends_on:
-      - redis
   tb-core2:
     env_file:
       - queue-confluent.env
-    depends_on:
-      - redis
   tb-rule-engine1:
     env_file:
       - queue-confluent.env
-    depends_on:
-      - redis
   tb-rule-engine2:
     env_file:
       - queue-confluent.env
-    depends_on:
-      - redis
   tb-mqtt-transport1:
     env_file:
       - queue-confluent.env

docker/docker-compose.yml

@@ -20,12 +20,13 @@ version: '2.2'
 services:
   zookeeper:
     restart: always
-    image: "zookeeper:3.5"
+    image: "zookeeper:3.8.0"
     ports:
       - "2181"
     environment:
       ZOO_MY_ID: 1
       ZOO_SERVERS: server.1=zookeeper:2888:3888;zookeeper:2181
+      ZOO_ADMINSERVER_ENABLED: "false"
   tb-js-executor:
     restart: always
     image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"