From 99de983635a4b5f49d3de77832d31352deabad02 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Thu, 23 Jun 2022 15:04:03 +0300
Subject: [PATCH 1/2] docker-compose: bump zookeeper version from 3.5 up to
 3.8.0, disable new admin feature (ZOO_ADMINSERVER_ENABLED=false)

---
 docker/docker-compose.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 62969b1051..3e0f21391d 100644
--- a/docker/docker-compose.yml
+++ b/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}"

From 46682b8bb6cb166e30e6226ae54bbcbc003c3368 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Thu, 23 Jun 2022 15:05:41 +0300
Subject: [PATCH 2/2] docker-compose: cleanup depends_on for external services

---
 docker/docker-compose.aws-sqs.yml   | 26 --------------------------
 docker/docker-compose.confluent.yml |  8 --------
 2 files changed, 34 deletions(-)

diff --git a/docker/docker-compose.aws-sqs.yml b/docker/docker-compose.aws-sqs.yml
index e50d0d424f..dff3f595ad 100644
--- a/docker/docker-compose.aws-sqs.yml
+++ b/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
diff --git a/docker/docker-compose.confluent.yml b/docker/docker-compose.confluent.yml
index 3d5abd0abe..077acdca98 100644
--- a/docker/docker-compose.confluent.yml
+++ b/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