(bigtop) branch branch-3.3 updated: BITOP-4128: Docker compose plugin doesn't have '-v' option (#1281)

[iwasakims]

This is an automated email from the ASF dual-hosted git repository.

iwasakims pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/branch-3.3 by this push:
     new d03a1b3d3 BITOP-4128: Docker compose plugin doesn't have '-v' option 
(#1281)
d03a1b3d3 is described below

commit d03a1b3d32f9bf4c3d511f0959aa35d0da3e0a57
Author: Shuhei Yamasaki <yamasaki...@oss.nttdata.com>
AuthorDate: Wed Jun 19 20:54:07 2024 +0900

    BITOP-4128: Docker compose plugin doesn't have '-v' option (#1281)
    
    (cherry picked from commit 9bd66b3f38696e3ef5f07b90118f3dc18a1ec6bb)
---
 provisioner/docker/docker-hadoop.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/provisioner/docker/docker-hadoop.sh 
b/provisioner/docker/docker-hadoop.sh
index f235ac9ae..6d8861f5a 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -271,7 +271,11 @@ env-check() {
     echo "Check docker:"
     docker -v || exit 1
     echo "Check docker-compose:"
-    $DOCKER_COMPOSE_CMD -v || exit 1
+    if [ "$DOCKER_COMPOSE_CMD" == "docker-compose" ]; then
+        $DOCKER_COMPOSE_CMD -v || exit 1
+    elif [ "$DOCKER_COMPOSE_CMD" == "docker compose" ]; then
+        $DOCKER_COMPOSE_CMD version || exit 1
+    fi
     echo "Check ruby:"
     ruby -v || exit 1
 }