From bdcab8af16aa396c2f99cf0667100294f101ad76 Mon Sep 17 00:00:00 2001
From: trikimiki <41070061+trikimiki@users.noreply.github.com>
Date: Fri, 25 Nov 2022 16:25:59 +0200
Subject: [PATCH 01/11] Docker microservices - Compatibility with Compose V2

---
 docker/docker-compose.yml        | 6 ++----
 docker/docker-install-tb.sh      | 4 ++--
 docker/docker-remove-services.sh | 2 +-
 docker/docker-start-services.sh  | 2 +-
 docker/docker-stop-services.sh   | 2 +-
 docker/docker-update-service.sh  | 4 ++--
 docker/docker-upgrade-tb.sh      | 6 +++---
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6ec410fcde..25f76ab015 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -14,9 +14,6 @@
 # limitations under the License.
 #
 
-
-version: '2.2'
-
 services:
   zookeeper:
     restart: always
@@ -30,7 +27,8 @@ services:
   tb-js-executor:
     restart: always
     image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"
-    scale: 10
+    deploy:
+      replicas: 10
     env_file:
       - tb-js-executor.env
   tb-core1:
diff --git a/docker/docker-install-tb.sh b/docker/docker-install-tb.sh
index 628b16e6ee..fc51712d1f 100755
--- a/docker/docker-install-tb.sh
+++ b/docker/docker-install-tb.sh
@@ -52,12 +52,12 @@ ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?
 checkFolders --create || exit $?
 
 if [ ! -z "${ADDITIONAL_STARTUP_SERVICES// }" ]; then
-    docker-compose \
+    docker compose \
       -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
       up -d $ADDITIONAL_STARTUP_SERVICES
 fi
 
-docker-compose \
+docker compose \
   -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
   run --no-deps --rm -e INSTALL_TB=true -e LOAD_DEMO=${loadDemo} \
   tb-core1
diff --git a/docker/docker-remove-services.sh b/docker/docker-remove-services.sh
index 769150c1f3..2448736915 100755
--- a/docker/docker-remove-services.sh
+++ b/docker/docker-remove-services.sh
@@ -27,6 +27,6 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?
 
 ADDITIONAL_COMPOSE_MONITORING_ARGS=$(additionalComposeMonitoringArgs) || exit $?
 
-docker-compose \
+docker compose \
   -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS \
   down -v
diff --git a/docker/docker-start-services.sh b/docker/docker-start-services.sh
index 1a06946308..44777e8c26 100755
--- a/docker/docker-start-services.sh
+++ b/docker/docker-start-services.sh
@@ -29,6 +29,6 @@ ADDITIONAL_COMPOSE_MONITORING_ARGS=$(additionalComposeMonitoringArgs) || exit $?
 
 checkFolders --create || exit $?
 
-docker-compose \
+docker compose \
   -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS \
   up -d
diff --git a/docker/docker-stop-services.sh b/docker/docker-stop-services.sh
index 5b09aea204..f2b742f2f0 100755
--- a/docker/docker-stop-services.sh
+++ b/docker/docker-stop-services.sh
@@ -27,6 +27,6 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?
 
 ADDITIONAL_COMPOSE_MONITORING_ARGS=$(additionalComposeMonitoringArgs) || exit $?
 
-docker-compose \
+docker compose \
   -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS \
   stop
diff --git a/docker/docker-update-service.sh b/docker/docker-update-service.sh
index 027280635d..3b5279b83a 100755
--- a/docker/docker-update-service.sh
+++ b/docker/docker-update-service.sh
@@ -25,9 +25,9 @@ ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
 
 ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?
 
-docker-compose \
+docker compose \
   -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
   pull $@
-docker-compose \
+docker compose \
   -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
   up -d --no-deps --build $@
diff --git a/docker/docker-upgrade-tb.sh b/docker/docker-upgrade-tb.sh
index 87dff9da15..7ef18bcc8a 100755
--- a/docker/docker-upgrade-tb.sh
+++ b/docker/docker-upgrade-tb.sh
@@ -50,16 +50,16 @@ ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?
 
 checkFolders --create || exit $?
 
-docker-compose \
+docker compose \
   -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
   pull \
   tb-core1
 
-docker-compose \
+docker compose \
   -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
   up -d $ADDITIONAL_STARTUP_SERVICES
 
-docker-compose \
+docker compose \
   -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
   run --no-deps --rm -e UPGRADE_TB=true -e FROM_VERSION=${fromVersion} \
   tb-core1

From f7ec2f0ec0bb5c88e16639592751c1b7b876f872 Mon Sep 17 00:00:00 2001
From: trikimiki <41070061+trikimiki@users.noreply.github.com>
Date: Mon, 28 Nov 2022 17:41:27 +0200
Subject: [PATCH 02/11] Docker microservices - Backward compatibility for
 Compose V1

---
 docker/compose-utils.sh          | 32 +++++++++++++++++++++++++
 docker/docker-install-tb.sh      | 41 ++++++++++++++++++++++++++------
 docker/docker-remove-services.sh | 20 +++++++++++++---
 docker/docker-start-services.sh  | 20 +++++++++++++---
 docker/docker-stop-services.sh   | 20 +++++++++++++---
 docker/docker-update-service.sh  | 29 +++++++++++++++++-----
 docker/docker-upgrade-tb.sh      | 40 ++++++++++++++++++++++---------
 7 files changed, 169 insertions(+), 33 deletions(-)

diff --git a/docker/compose-utils.sh b/docker/compose-utils.sh
index f45339eb92..c1963cc045 100755
--- a/docker/compose-utils.sh
+++ b/docker/compose-utils.sh
@@ -195,3 +195,35 @@ function checkFolders() {
   done < <(echo "$PERMISSION_LIST")
   return $EXIT_CODE
 }
+
+function composeVersion() {
+    #Checking whether "set -e" shell option should be restored after Compose version check
+    FLAG_SET=false
+    if [[ $SHELLOPTS =~ errexit ]]; then
+        set +e
+        FLAG_SET=true
+    fi
+
+    #Checking Compose V1 availablity
+    docker-compose version >/dev/null 2>&1
+    if [ $? -eq 0 ]; then status_v1=true; else status_v1=false; fi
+
+    #Checking Compose V2 availablity
+    docker compose version >/dev/null 2>&1
+    if [ $? -eq 0 ]; then status_v2=true; else status_v2=false; fi
+
+    COMPOSE_VERSION=""
+
+    if $status_v2 ; then
+        COMPOSE_VERSION="V2"
+    elif $status_v1 ; then
+        COMPOSE_VERSION="V1"
+    else
+        echo "Docker Compose plugin is not detected. Please check your environment." >&2
+        exit 1
+    fi
+
+    echo $COMPOSE_VERSION
+
+    if $FLAG_SET ; then set -e; fi
+}
diff --git a/docker/docker-install-tb.sh b/docker/docker-install-tb.sh
index fc51712d1f..01eefeb4a8 100755
--- a/docker/docker-install-tb.sh
+++ b/docker/docker-install-tb.sh
@@ -41,6 +41,8 @@ set -e
 
 source compose-utils.sh
 
+COMPOSE_VERSION=$(composeVersion) || exit $?
+
 ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
 
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
@@ -52,14 +54,39 @@ ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?
 checkFolders --create || exit $?
 
 if [ ! -z "${ADDITIONAL_STARTUP_SERVICES// }" ]; then
-    docker compose \
-      -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
-      up -d $ADDITIONAL_STARTUP_SERVICES
+
+    COMPOSE_ARGS="\
+          -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} ${ADDITIONAL_COMPOSE_ARGS} ${ADDITIONAL_COMPOSE_QUEUE_ARGS} \
+          up -d ${ADDITIONAL_STARTUP_SERVICES}"
+
+    case $COMPOSE_VERSION in
+        V2)
+            docker compose $COMPOSE_ARGS
+        ;;
+        V1)
+            docker-compose $COMPOSE_ARGS
+        ;;
+        *)
+            # unknown option
+        ;;
+    esac
 fi
 
-docker compose \
-  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
-  run --no-deps --rm -e INSTALL_TB=true -e LOAD_DEMO=${loadDemo} \
-  tb-core1
+COMPOSE_ARGS="\
+      -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} ${ADDITIONAL_COMPOSE_ARGS} ${ADDITIONAL_COMPOSE_QUEUE_ARGS} \
+      run --no-deps --rm -e INSTALL_TB=true -e LOAD_DEMO=${loadDemo} \
+      tb-core1"
+
+case $COMPOSE_VERSION in
+    V2)
+        docker compose $COMPOSE_ARGS
+    ;;
+    V1)
+        docker-compose $COMPOSE_ARGS
+    ;;
+    *)
+        # unknown option
+    ;;
+esac
 
 
diff --git a/docker/docker-remove-services.sh b/docker/docker-remove-services.sh
index 2448736915..1e2a55f976 100755
--- a/docker/docker-remove-services.sh
+++ b/docker/docker-remove-services.sh
@@ -19,6 +19,8 @@ set -e
 
 source compose-utils.sh
 
+COMPOSE_VERSION=$(composeVersion) || exit $?
+
 ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
 
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
@@ -27,6 +29,18 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?
 
 ADDITIONAL_COMPOSE_MONITORING_ARGS=$(additionalComposeMonitoringArgs) || exit $?
 
-docker compose \
-  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS \
-  down -v
+COMPOSE_ARGS="\
+      -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} ${ADDITIONAL_COMPOSE_ARGS} ${ADDITIONAL_COMPOSE_QUEUE_ARGS} ${ADDITIONAL_COMPOSE_MONITORING_ARGS} \
+      down -v"
+
+case $COMPOSE_VERSION in
+    V2)
+        docker compose $COMPOSE_ARGS
+    ;;
+    V1)
+        docker-compose $COMPOSE_ARGS
+    ;;
+    *)
+        # unknown option
+    ;;
+esac
diff --git a/docker/docker-start-services.sh b/docker/docker-start-services.sh
index 44777e8c26..dfccdef29b 100755
--- a/docker/docker-start-services.sh
+++ b/docker/docker-start-services.sh
@@ -19,6 +19,8 @@ set -e
 
 source compose-utils.sh
 
+COMPOSE_VERSION=$(composeVersion) || exit $?
+
 ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
 
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
@@ -29,6 +31,18 @@ ADDITIONAL_COMPOSE_MONITORING_ARGS=$(additionalComposeMonitoringArgs) || exit $?
 
 checkFolders --create || exit $?
 
-docker compose \
-  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS \
-  up -d
+COMPOSE_ARGS="\
+      -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} ${ADDITIONAL_COMPOSE_ARGS} ${ADDITIONAL_COMPOSE_QUEUE_ARGS} ${ADDITIONAL_COMPOSE_MONITORING_ARGS} \
+      up -d"
+
+case $COMPOSE_VERSION in
+    V2)
+        docker compose $COMPOSE_ARGS
+    ;;
+    V1)
+        docker-compose $COMPOSE_ARGS
+    ;;
+    *)
+        # unknown option
+    ;;
+esac
diff --git a/docker/docker-stop-services.sh b/docker/docker-stop-services.sh
index f2b742f2f0..4edd755d43 100755
--- a/docker/docker-stop-services.sh
+++ b/docker/docker-stop-services.sh
@@ -19,6 +19,8 @@ set -e
 
 source compose-utils.sh
 
+COMPOSE_VERSION=$(composeVersion) || exit $?
+
 ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
 
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
@@ -27,6 +29,18 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?
 
 ADDITIONAL_COMPOSE_MONITORING_ARGS=$(additionalComposeMonitoringArgs) || exit $?
 
-docker compose \
-  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS \
-  stop
+COMPOSE_ARGS="\
+      -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} ${ADDITIONAL_COMPOSE_ARGS} ${ADDITIONAL_COMPOSE_QUEUE_ARGS} ${ADDITIONAL_COMPOSE_MONITORING_ARGS} \
+      stop"
+
+case $COMPOSE_VERSION in
+    V2)
+        docker compose $COMPOSE_ARGS
+    ;;
+    V1)
+        docker-compose $COMPOSE_ARGS
+    ;;
+    *)
+        # unknown option
+    ;;
+esac
diff --git a/docker/docker-update-service.sh b/docker/docker-update-service.sh
index 3b5279b83a..fe2e2b3ce2 100755
--- a/docker/docker-update-service.sh
+++ b/docker/docker-update-service.sh
@@ -19,15 +19,32 @@ set -e
 
 source compose-utils.sh
 
+COMPOSE_VERSION=$(composeVersion) || exit $?
+
 ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
 
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
 
 ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?
 
-docker compose \
-  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
-  pull $@
-docker compose \
-  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
-  up -d --no-deps --build $@
+COMPOSE_ARGS_PULL="\
+      -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} ${ADDITIONAL_COMPOSE_ARGS} ${ADDITIONAL_COMPOSE_QUEUE_ARGS} \
+      pull"
+
+COMPOSE_ARGS_BUILD="\
+      -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} ${ADDITIONAL_COMPOSE_ARGS} ${ADDITIONAL_COMPOSE_QUEUE_ARGS} \
+      up -d --no-deps --build"
+
+case $COMPOSE_VERSION in
+    V2)
+        docker compose $COMPOSE_ARGS_PULL $@
+        docker compose $COMPOSE_ARGS_BUILD $@
+    ;;
+    V1)
+        docker-compose $COMPOSE_ARGS_PULL $@
+        docker-compose $COMPOSE_ARGS_BUILD $@
+    ;;
+    *)
+        # unknown option
+    ;;
+esac
diff --git a/docker/docker-upgrade-tb.sh b/docker/docker-upgrade-tb.sh
index 7ef18bcc8a..18ce476d62 100755
--- a/docker/docker-upgrade-tb.sh
+++ b/docker/docker-upgrade-tb.sh
@@ -40,6 +40,8 @@ set -e
 
 source compose-utils.sh
 
+COMPOSE_VERSION=$(composeVersion) || exit $?
+
 ADDITIONAL_COMPOSE_QUEUE_ARGS=$(additionalComposeQueueArgs) || exit $?
 
 ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?
@@ -50,16 +52,32 @@ ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?
 
 checkFolders --create || exit $?
 
-docker compose \
-  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
-  pull \
-  tb-core1
+COMPOSE_ARGS_PULL="\
+      -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} ${ADDITIONAL_COMPOSE_ARGS} ${ADDITIONAL_COMPOSE_QUEUE_ARGS} \
+      pull \
+      tb-core1"
+
+COMPOSE_ARGS_UP="\
+      -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} ${ADDITIONAL_COMPOSE_ARGS} ${ADDITIONAL_COMPOSE_QUEUE_ARGS} \
+      up -d ${ADDITIONAL_STARTUP_SERVICES}"
 
-docker compose \
-  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
-  up -d $ADDITIONAL_STARTUP_SERVICES
+COMPOSE_ARGS_RUN="\
+      -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} ${ADDITIONAL_COMPOSE_ARGS} ${ADDITIONAL_COMPOSE_QUEUE_ARGS} \
+      run --no-deps --rm -e UPGRADE_TB=true -e FROM_VERSION=${fromVersion} \
+      tb-core1"
 
-docker compose \
-  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
-  run --no-deps --rm -e UPGRADE_TB=true -e FROM_VERSION=${fromVersion} \
-  tb-core1
+case $COMPOSE_VERSION in
+    V2)
+        docker compose $COMPOSE_ARGS_PULL
+        docker compose $COMPOSE_ARGS_UP
+        docker compose $COMPOSE_ARGS_RUN
+    ;;
+    V1)
+        docker-compose $COMPOSE_ARGS_PULL
+        docker-compose $COMPOSE_ARGS_UP
+        docker-compose $COMPOSE_ARGS_RUN
+    ;;
+    *)
+        # unknown option
+    ;;
+esac

From 284097c88e6eb0b65b7d90f99d067425c30d8069 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 30 Nov 2022 10:44:32 +0200
Subject: [PATCH 03/11] Fixed start of service for outdated docker-compose

---
 docker/docker-compose.yml       | 5 +++--
 docker/docker-start-services.sh | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 25f76ab015..f94495ddb7 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+version: '2.2'
+
 services:
   zookeeper:
     restart: always
@@ -27,8 +29,7 @@ services:
   tb-js-executor:
     restart: always
     image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"
-    deploy:
-      replicas: 10
+    scale: 10
     env_file:
       - tb-js-executor.env
   tb-core1:
diff --git a/docker/docker-start-services.sh b/docker/docker-start-services.sh
index dfccdef29b..038697aebd 100755
--- a/docker/docker-start-services.sh
+++ b/docker/docker-start-services.sh
@@ -37,7 +37,7 @@ COMPOSE_ARGS="\
 
 case $COMPOSE_VERSION in
     V2)
-        docker compose $COMPOSE_ARGS
+        docker compose $COMPOSE_ARGS --scale tb-js-executor=10
     ;;
     V1)
         docker-compose $COMPOSE_ARGS

From 45e2a3e912e8377d10b10d122f12e473c463a7f0 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 30 Nov 2022 10:50:26 +0200
Subject: [PATCH 04/11] Revert removed line

---
 docker/docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f94495ddb7..6ec410fcde 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+
 version: '2.2'
 
 services:

From b25d33f3a649b18e8ff883351b42c87c3dcdc452 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 30 Nov 2022 12:23:14 +0200
Subject: [PATCH 05/11] Added comment for js-executor scale config in
 docker-compose to update correctly in case docker compose plugin V2 is used

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

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6ec410fcde..17d82f6305 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -30,6 +30,8 @@ services:
   tb-js-executor:
     restart: always
     image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"
+    # in case docker compose plugin V2 is used please update next line in docker-start-services.sh file:
+    # docker compose $COMPOSE_ARGS --scale tb-js-executor=10
     scale: 10
     env_file:
       - tb-js-executor.env

From 15c34bfc11351d9601a1797de32fb93dc11d6fa3 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 30 Nov 2022 12:25:51 +0200
Subject: [PATCH 06/11] Added comment that scale docker compose config is not
 supported

---
 docker/docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 17d82f6305..9fd2f3647e 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -30,6 +30,7 @@ services:
   tb-js-executor:
     restart: always
     image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"
+    # 'scale' configuration is not supported in V2
     # in case docker compose plugin V2 is used please update next line in docker-start-services.sh file:
     # docker compose $COMPOSE_ARGS --scale tb-js-executor=10
     scale: 10

From af69cf576bd5badbf2bc070ae34c696b755e2ea1 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 30 Nov 2022 12:59:45 +0200
Subject: [PATCH 07/11] Update docker-compose files version from 2.2 to 3.
 Replace scale with deploy.replicas

---
 docker/docker-compose.aws-sqs.yml               | 2 +-
 docker/docker-compose.cassandra.volumes.yml     | 2 +-
 docker/docker-compose.confluent.yml             | 2 +-
 docker/docker-compose.hybrid.yml                | 2 +-
 docker/docker-compose.kafka.yml                 | 2 +-
 docker/docker-compose.postgres.volumes.yml      | 2 +-
 docker/docker-compose.postgres.yml              | 2 +-
 docker/docker-compose.prometheus-grafana.yml    | 2 +-
 docker/docker-compose.pubsub.yml                | 2 +-
 docker/docker-compose.rabbitmq.yml              | 2 +-
 docker/docker-compose.redis-cluster.volumes.yml | 2 +-
 docker/docker-compose.redis-cluster.yml         | 2 +-
 docker/docker-compose.redis.volumes.yml         | 2 +-
 docker/docker-compose.redis.yml                 | 2 +-
 docker/docker-compose.service-bus.yml           | 2 +-
 docker/docker-compose.volumes.yml               | 2 +-
 docker/docker-compose.yml                       | 8 +++-----
 docker/docker-start-services.sh                 | 3 ++-
 18 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/docker/docker-compose.aws-sqs.yml b/docker/docker-compose.aws-sqs.yml
index 331902851f..d65194eaea 100644
--- a/docker/docker-compose.aws-sqs.yml
+++ b/docker/docker-compose.aws-sqs.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   tb-js-executor:
diff --git a/docker/docker-compose.cassandra.volumes.yml b/docker/docker-compose.cassandra.volumes.yml
index 37880b44fa..05e7c4c6da 100644
--- a/docker/docker-compose.cassandra.volumes.yml
+++ b/docker/docker-compose.cassandra.volumes.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   cassandra:
diff --git a/docker/docker-compose.confluent.yml b/docker/docker-compose.confluent.yml
index 077acdca98..f14843ae80 100644
--- a/docker/docker-compose.confluent.yml
+++ b/docker/docker-compose.confluent.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   tb-js-executor:
diff --git a/docker/docker-compose.hybrid.yml b/docker/docker-compose.hybrid.yml
index 12ea4cd099..01659ad0c6 100644
--- a/docker/docker-compose.hybrid.yml
+++ b/docker/docker-compose.hybrid.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   postgres:
diff --git a/docker/docker-compose.kafka.yml b/docker/docker-compose.kafka.yml
index e6fa0c489f..3bc268c4ec 100644
--- a/docker/docker-compose.kafka.yml
+++ b/docker/docker-compose.kafka.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   kafka:
diff --git a/docker/docker-compose.postgres.volumes.yml b/docker/docker-compose.postgres.volumes.yml
index caf78f23d7..113876e29d 100644
--- a/docker/docker-compose.postgres.volumes.yml
+++ b/docker/docker-compose.postgres.volumes.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   postgres:
diff --git a/docker/docker-compose.postgres.yml b/docker/docker-compose.postgres.yml
index 8fe8e6f53d..a5dc428d50 100644
--- a/docker/docker-compose.postgres.yml
+++ b/docker/docker-compose.postgres.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   postgres:
diff --git a/docker/docker-compose.prometheus-grafana.yml b/docker/docker-compose.prometheus-grafana.yml
index c31b25190e..5d10e9aa01 100644
--- a/docker/docker-compose.prometheus-grafana.yml
+++ b/docker/docker-compose.prometheus-grafana.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 volumes:
     prometheus_data: {}
diff --git a/docker/docker-compose.pubsub.yml b/docker/docker-compose.pubsub.yml
index 7c122d0835..8b918c1565 100644
--- a/docker/docker-compose.pubsub.yml
+++ b/docker/docker-compose.pubsub.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   tb-js-executor:
diff --git a/docker/docker-compose.rabbitmq.yml b/docker/docker-compose.rabbitmq.yml
index 1f1cf1554c..c6ebb2d31f 100644
--- a/docker/docker-compose.rabbitmq.yml
+++ b/docker/docker-compose.rabbitmq.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   tb-js-executor:
diff --git a/docker/docker-compose.redis-cluster.volumes.yml b/docker/docker-compose.redis-cluster.volumes.yml
index 2cf319bd21..edb636f7f1 100644
--- a/docker/docker-compose.redis-cluster.volumes.yml
+++ b/docker/docker-compose.redis-cluster.volumes.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   # Redis cluster
diff --git a/docker/docker-compose.redis-cluster.yml b/docker/docker-compose.redis-cluster.yml
index 9763b5d79a..532140c5e6 100644
--- a/docker/docker-compose.redis-cluster.yml
+++ b/docker/docker-compose.redis-cluster.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
 # Redis cluster
diff --git a/docker/docker-compose.redis.volumes.yml b/docker/docker-compose.redis.volumes.yml
index 090aa441fe..d99d90b4a7 100644
--- a/docker/docker-compose.redis.volumes.yml
+++ b/docker/docker-compose.redis.volumes.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   redis:
diff --git a/docker/docker-compose.redis.yml b/docker/docker-compose.redis.yml
index e53a974134..5fff8cb0f1 100644
--- a/docker/docker-compose.redis.yml
+++ b/docker/docker-compose.redis.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
 # Redis standalone
diff --git a/docker/docker-compose.service-bus.yml b/docker/docker-compose.service-bus.yml
index 6e39de0baa..e2bdfc367f 100644
--- a/docker/docker-compose.service-bus.yml
+++ b/docker/docker-compose.service-bus.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   tb-js-executor:
diff --git a/docker/docker-compose.volumes.yml b/docker/docker-compose.volumes.yml
index 58269473e4..683f5efc81 100644
--- a/docker/docker-compose.volumes.yml
+++ b/docker/docker-compose.volumes.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '2.2'
+version: '3'
 
 services:
   tb-core1:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 9fd2f3647e..07063979fc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -15,7 +15,7 @@
 #
 
 
-version: '2.2'
+version: '3'
 
 services:
   zookeeper:
@@ -30,10 +30,8 @@ services:
   tb-js-executor:
     restart: always
     image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"
-    # 'scale' configuration is not supported in V2
-    # in case docker compose plugin V2 is used please update next line in docker-start-services.sh file:
-    # docker compose $COMPOSE_ARGS --scale tb-js-executor=10
-    scale: 10
+    deploy:
+      replicas: 10
     env_file:
       - tb-js-executor.env
   tb-core1:
diff --git a/docker/docker-start-services.sh b/docker/docker-start-services.sh
index 038697aebd..1532898a99 100755
--- a/docker/docker-start-services.sh
+++ b/docker/docker-start-services.sh
@@ -37,10 +37,11 @@ COMPOSE_ARGS="\
 
 case $COMPOSE_VERSION in
     V2)
-        docker compose $COMPOSE_ARGS --scale tb-js-executor=10
+        docker compose $COMPOSE_ARGS
     ;;
     V1)
         docker-compose $COMPOSE_ARGS
+        docker-compose scale tb-js-executor=10
     ;;
     *)
         # unknown option

From 334890069cfe484e86aa53766f0f601eec7aea66 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 30 Nov 2022 13:01:53 +0200
Subject: [PATCH 08/11] Added comment that deploy.replicas is not supported by
 docker-compose

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

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 07063979fc..277f300e4c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -30,6 +30,9 @@ services:
   tb-js-executor:
     restart: always
     image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"
+    # 'deploy.replicas' configuration is not supported in docker-compose
+    # in case outdated docker-compose is used please update next line in docker-start-services.sh file to scale tb-js-executors:
+    # docker-compose scale tb-js-executor=10
     deploy:
       replicas: 10
     env_file:

From 01d9af24b4bf28c0cb1ce7609269594718f15267 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 30 Nov 2022 13:14:25 +0200
Subject: [PATCH 09/11] Remove deprecated scale

---
 docker/docker-compose.yml       | 2 +-
 docker/docker-start-services.sh | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 277f300e4c..65bdafe8b8 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -32,7 +32,7 @@ services:
     image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"
     # 'deploy.replicas' configuration is not supported in docker-compose
     # in case outdated docker-compose is used please update next line in docker-start-services.sh file to scale tb-js-executors:
-    # docker-compose scale tb-js-executor=10
+    # docker-compose $COMPOSE_ARGS --scale tb-js-executor=10
     deploy:
       replicas: 10
     env_file:
diff --git a/docker/docker-start-services.sh b/docker/docker-start-services.sh
index 1532898a99..0ee6c3abd2 100755
--- a/docker/docker-start-services.sh
+++ b/docker/docker-start-services.sh
@@ -40,8 +40,7 @@ case $COMPOSE_VERSION in
         docker compose $COMPOSE_ARGS
     ;;
     V1)
-        docker-compose $COMPOSE_ARGS
-        docker-compose scale tb-js-executor=10
+        docker-compose $COMPOSE_ARGS --scale tb-js-executor=10
     ;;
     *)
         # unknown option

From f959da7f521fb3e08f56e02198a759545f02a157 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 30 Nov 2022 15:17:13 +0200
Subject: [PATCH 10/11] Docker-compose - remove scale and add compatibility
 mode for docker-compose standalone

---
 docker/docker-compose.yml       | 3 ---
 docker/docker-start-services.sh | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 65bdafe8b8..07063979fc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -30,9 +30,6 @@ services:
   tb-js-executor:
     restart: always
     image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"
-    # 'deploy.replicas' configuration is not supported in docker-compose
-    # in case outdated docker-compose is used please update next line in docker-start-services.sh file to scale tb-js-executors:
-    # docker-compose $COMPOSE_ARGS --scale tb-js-executor=10
     deploy:
       replicas: 10
     env_file:
diff --git a/docker/docker-start-services.sh b/docker/docker-start-services.sh
index 0ee6c3abd2..3603382b4d 100755
--- a/docker/docker-start-services.sh
+++ b/docker/docker-start-services.sh
@@ -40,7 +40,7 @@ case $COMPOSE_VERSION in
         docker compose $COMPOSE_ARGS
     ;;
     V1)
-        docker-compose $COMPOSE_ARGS --scale tb-js-executor=10
+        docker-compose --compatibility $COMPOSE_ARGS
     ;;
     *)
         # unknown option

From 641323641193b90d2dbaf8e9b7bd40c98b91fd2c Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 30 Nov 2022 15:18:52 +0200
Subject: [PATCH 11/11] Docker-compose - 3 -> 3.0

---
 docker/docker-compose.aws-sqs.yml               | 2 +-
 docker/docker-compose.cassandra.volumes.yml     | 2 +-
 docker/docker-compose.confluent.yml             | 2 +-
 docker/docker-compose.hybrid.yml                | 2 +-
 docker/docker-compose.kafka.yml                 | 2 +-
 docker/docker-compose.postgres.volumes.yml      | 2 +-
 docker/docker-compose.postgres.yml              | 2 +-
 docker/docker-compose.prometheus-grafana.yml    | 2 +-
 docker/docker-compose.pubsub.yml                | 2 +-
 docker/docker-compose.rabbitmq.yml              | 2 +-
 docker/docker-compose.redis-cluster.volumes.yml | 2 +-
 docker/docker-compose.redis-cluster.yml         | 2 +-
 docker/docker-compose.redis.volumes.yml         | 2 +-
 docker/docker-compose.redis.yml                 | 2 +-
 docker/docker-compose.service-bus.yml           | 2 +-
 docker/docker-compose.volumes.yml               | 2 +-
 docker/docker-compose.yml                       | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/docker/docker-compose.aws-sqs.yml b/docker/docker-compose.aws-sqs.yml
index d65194eaea..d6a542a340 100644
--- a/docker/docker-compose.aws-sqs.yml
+++ b/docker/docker-compose.aws-sqs.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   tb-js-executor:
diff --git a/docker/docker-compose.cassandra.volumes.yml b/docker/docker-compose.cassandra.volumes.yml
index 05e7c4c6da..4ee4760fb0 100644
--- a/docker/docker-compose.cassandra.volumes.yml
+++ b/docker/docker-compose.cassandra.volumes.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   cassandra:
diff --git a/docker/docker-compose.confluent.yml b/docker/docker-compose.confluent.yml
index f14843ae80..e7eee83c3b 100644
--- a/docker/docker-compose.confluent.yml
+++ b/docker/docker-compose.confluent.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   tb-js-executor:
diff --git a/docker/docker-compose.hybrid.yml b/docker/docker-compose.hybrid.yml
index 01659ad0c6..2c84b41805 100644
--- a/docker/docker-compose.hybrid.yml
+++ b/docker/docker-compose.hybrid.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   postgres:
diff --git a/docker/docker-compose.kafka.yml b/docker/docker-compose.kafka.yml
index 3bc268c4ec..99b06d21fd 100644
--- a/docker/docker-compose.kafka.yml
+++ b/docker/docker-compose.kafka.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   kafka:
diff --git a/docker/docker-compose.postgres.volumes.yml b/docker/docker-compose.postgres.volumes.yml
index 113876e29d..51138a4d5b 100644
--- a/docker/docker-compose.postgres.volumes.yml
+++ b/docker/docker-compose.postgres.volumes.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   postgres:
diff --git a/docker/docker-compose.postgres.yml b/docker/docker-compose.postgres.yml
index a5dc428d50..f9c27c4743 100644
--- a/docker/docker-compose.postgres.yml
+++ b/docker/docker-compose.postgres.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   postgres:
diff --git a/docker/docker-compose.prometheus-grafana.yml b/docker/docker-compose.prometheus-grafana.yml
index 5d10e9aa01..af560fec89 100644
--- a/docker/docker-compose.prometheus-grafana.yml
+++ b/docker/docker-compose.prometheus-grafana.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 volumes:
     prometheus_data: {}
diff --git a/docker/docker-compose.pubsub.yml b/docker/docker-compose.pubsub.yml
index 8b918c1565..8e046b24d3 100644
--- a/docker/docker-compose.pubsub.yml
+++ b/docker/docker-compose.pubsub.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   tb-js-executor:
diff --git a/docker/docker-compose.rabbitmq.yml b/docker/docker-compose.rabbitmq.yml
index c6ebb2d31f..fc3b8a7b1e 100644
--- a/docker/docker-compose.rabbitmq.yml
+++ b/docker/docker-compose.rabbitmq.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   tb-js-executor:
diff --git a/docker/docker-compose.redis-cluster.volumes.yml b/docker/docker-compose.redis-cluster.volumes.yml
index edb636f7f1..03b29110e3 100644
--- a/docker/docker-compose.redis-cluster.volumes.yml
+++ b/docker/docker-compose.redis-cluster.volumes.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   # Redis cluster
diff --git a/docker/docker-compose.redis-cluster.yml b/docker/docker-compose.redis-cluster.yml
index 532140c5e6..766a22bfdd 100644
--- a/docker/docker-compose.redis-cluster.yml
+++ b/docker/docker-compose.redis-cluster.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
 # Redis cluster
diff --git a/docker/docker-compose.redis.volumes.yml b/docker/docker-compose.redis.volumes.yml
index d99d90b4a7..c96da9a5ab 100644
--- a/docker/docker-compose.redis.volumes.yml
+++ b/docker/docker-compose.redis.volumes.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   redis:
diff --git a/docker/docker-compose.redis.yml b/docker/docker-compose.redis.yml
index 5fff8cb0f1..c1ec7c18a9 100644
--- a/docker/docker-compose.redis.yml
+++ b/docker/docker-compose.redis.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
 # Redis standalone
diff --git a/docker/docker-compose.service-bus.yml b/docker/docker-compose.service-bus.yml
index e2bdfc367f..ff099de444 100644
--- a/docker/docker-compose.service-bus.yml
+++ b/docker/docker-compose.service-bus.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   tb-js-executor:
diff --git a/docker/docker-compose.volumes.yml b/docker/docker-compose.volumes.yml
index 683f5efc81..dffdcacd2a 100644
--- a/docker/docker-compose.volumes.yml
+++ b/docker/docker-compose.volumes.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version: '3'
+version: '3.0'
 
 services:
   tb-core1:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 07063979fc..38b2b9b0f3 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -15,7 +15,7 @@
 #
 
 
-version: '3'
+version: '3.0'
 
 services:
   zookeeper: