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] 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