[apisix-ingress-controller] branch master updated: chore: add docker compose and docker-compose compatible (#1808)

[zh...@apache.org]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new 2641b782 chore: add docker compose and docker-compose compatible (#1808)
2641b782 is described below

commit 2641b782b7c46c53f865f6d7e4b1e702e9141d4e
Author: John Chever <ch...@gmail.com>
AuthorDate: Sun Apr 23 15:01:24 2023 +0800

    chore: add docker compose and docker-compose compatible (#1808)
---
 test/e2e/testdata/ldap/cmd.sh      | 16 +++++++++++++---
 test/e2e/testdata/wolf-rbac/cmd.sh | 18 ++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/test/e2e/testdata/ldap/cmd.sh b/test/e2e/testdata/ldap/cmd.sh
index 7f2f5927..871dcbab 100755
--- a/test/e2e/testdata/ldap/cmd.sh
+++ b/test/e2e/testdata/ldap/cmd.sh
@@ -20,17 +20,27 @@
 cd test/e2e/testdata/ldap/
 
 OPTION=$1
+COMPOSE_CMD=""
+
+if command -v "docker-compose" > /dev/null 2>&1; then
+    COMPOSE_CMD="docker-compose"
+elif command -v "docker" > /dev/null 2>&1; then
+    COMPOSE_CMD="docker compose"
+else
+    echo "docker-compose or docker compose not found"
+    exit 1
+fi
 
 if  [ $OPTION = "ip" ]; then
     echo -n `docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' openldap`
 elif [ $OPTION = "start" ]; then
-    docker-compose -f 'docker-compose.yaml'  -p 'openldap' down
+    $COMPOSE_CMD -f 'docker-compose.yaml'  -p 'openldap' down
 
     # start openldap
-    docker-compose -f 'docker-compose.yaml'  -p 'openldap' up -d
+    $COMPOSE_CMD -f 'docker-compose.yaml'  -p 'openldap' up -d
 
 elif [ $OPTION = "stop" ]; then
-    docker-compose -f  'docker-compose.yaml'  -p 'openldap' down
+    $COMPOSE_CMD -f  'docker-compose.yaml'  -p 'openldap' down
 else
     echo "argument is one of [ip, start, stop]"
 fi
diff --git a/test/e2e/testdata/wolf-rbac/cmd.sh b/test/e2e/testdata/wolf-rbac/cmd.sh
index 54cd1c85..13aff671 100755
--- a/test/e2e/testdata/wolf-rbac/cmd.sh
+++ b/test/e2e/testdata/wolf-rbac/cmd.sh
@@ -20,20 +20,30 @@
 cd test/e2e/testdata/wolf-rbac/
 
 OPTION=$1
+COMPOSE_CMD=""
+
+if command -v "docker-compose" > /dev/null 2>&1; then
+    COMPOSE_CMD="docker-compose"
+elif command -v "docker" > /dev/null 2>&1; then
+    COMPOSE_CMD="docker compose"
+else
+    echo "docker-compose or docker compose not found"
+    exit 1
+fi
 
 if  [ $OPTION = "ip" ]; then
     echo -n `docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' wolf-server`
 elif [ $OPTION = "start" ]; then
-    docker-compose -f 'docker-compose.yaml'  -p 'wolf-rbac' down
+    $COMPOSE_CMD -f 'docker-compose.yaml'  -p 'wolf-rbac' down
     rm -rf db-psql.sql
 
     wget https://raw.githubusercontent.com/iGeeky/wolf/f6ddeb75a37bff90406f0f0a2b7ae5d16f6f3bd4/server/script/db-psql.sql
 
     # start database
-    docker-compose up -d database
+    $COMPOSE_CMD up -d database
 
     # start wolf-server
-    docker-compose up -d server restful-demo agent-or agent-demo
+    $COMPOSE_CMD up -d server restful-demo agent-or agent-demo
 
     sleep 6
 
@@ -68,7 +78,7 @@ elif [ $OPTION = "start" ]; then
         "appIDs": ["test-app"]
     }'
 elif [ $OPTION = "stop" ]; then
-    docker-compose -f 'docker-compose.yaml'  -p 'wolf-rbac' down
+    $COMPOSE_CMD -f 'docker-compose.yaml'  -p 'wolf-rbac' down
     rm -rf db-psql.sql
 else
     echo "argument is one of [ip, start, stop]"