Merge remote-tracking branch 'origin/trikimiki-master'

2022-11-30 10:46:07 +02:00 · 2022-11-30 10:46:07 +02:00 · a22f3925cf
commit a22f3925cf
parent 8c7371ae8c 284097c88e
8 changed files with 169 additions and 34 deletions
--- 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
+}
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -14,7 +14,6 @@
 # limitations under the License.
 #

-
 version: '2.2'

 services:
--- 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


--- 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
--- 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 --scale tb-js-executor=10
+    ;;
+    V1)
+        docker-compose $COMPOSE_ARGS
+    ;;
+    *)
+        # unknown option
+    ;;
+esac
--- 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
--- 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
--- 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"

-docker-compose \
-  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
-  up -d $ADDITIONAL_STARTUP_SERVICES
+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 \
-  run --no-deps --rm -e UPGRADE_TB=true -e FROM_VERSION=${fromVersion} \
-  tb-core1
+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"
+
+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