Skip to content

Commit 2641b78

Browse files
authored
chore: add docker compose and docker-compose compatible (#1808)
1 parent abfacd6 commit 2641b78

File tree

2 files changed

+27
-7
lines changed

2 files changed

+27
-7
lines changed

test/e2e/testdata/ldap/cmd.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,27 @@
2020
cd test/e2e/testdata/ldap/
2121

2222
OPTION=$1
23+
COMPOSE_CMD=""
24+
25+
if command -v "docker-compose" > /dev/null 2>&1; then
26+
COMPOSE_CMD="docker-compose"
27+
elif command -v "docker" > /dev/null 2>&1; then
28+
COMPOSE_CMD="docker compose"
29+
else
30+
echo "docker-compose or docker compose not found"
31+
exit 1
32+
fi
2333

2434
if [ $OPTION = "ip" ]; then
2535
echo -n `docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' openldap`
2636
elif [ $OPTION = "start" ]; then
27-
docker-compose -f 'docker-compose.yaml' -p 'openldap' down
37+
$COMPOSE_CMD -f 'docker-compose.yaml' -p 'openldap' down
2838

2939
# start openldap
30-
docker-compose -f 'docker-compose.yaml' -p 'openldap' up -d
40+
$COMPOSE_CMD -f 'docker-compose.yaml' -p 'openldap' up -d
3141

3242
elif [ $OPTION = "stop" ]; then
33-
docker-compose -f 'docker-compose.yaml' -p 'openldap' down
43+
$COMPOSE_CMD -f 'docker-compose.yaml' -p 'openldap' down
3444
else
3545
echo "argument is one of [ip, start, stop]"
3646
fi

test/e2e/testdata/wolf-rbac/cmd.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,30 @@
2020
cd test/e2e/testdata/wolf-rbac/
2121

2222
OPTION=$1
23+
COMPOSE_CMD=""
24+
25+
if command -v "docker-compose" > /dev/null 2>&1; then
26+
COMPOSE_CMD="docker-compose"
27+
elif command -v "docker" > /dev/null 2>&1; then
28+
COMPOSE_CMD="docker compose"
29+
else
30+
echo "docker-compose or docker compose not found"
31+
exit 1
32+
fi
2333

2434
if [ $OPTION = "ip" ]; then
2535
echo -n `docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' wolf-server`
2636
elif [ $OPTION = "start" ]; then
27-
docker-compose -f 'docker-compose.yaml' -p 'wolf-rbac' down
37+
$COMPOSE_CMD -f 'docker-compose.yaml' -p 'wolf-rbac' down
2838
rm -rf db-psql.sql
2939

3040
wget https://raw.githubusercontent.com/iGeeky/wolf/f6ddeb75a37bff90406f0f0a2b7ae5d16f6f3bd4/server/script/db-psql.sql
3141

3242
# start database
33-
docker-compose up -d database
43+
$COMPOSE_CMD up -d database
3444

3545
# start wolf-server
36-
docker-compose up -d server restful-demo agent-or agent-demo
46+
$COMPOSE_CMD up -d server restful-demo agent-or agent-demo
3747

3848
sleep 6
3949

@@ -68,7 +78,7 @@ elif [ $OPTION = "start" ]; then
6878
"appIDs": ["test-app"]
6979
}'
7080
elif [ $OPTION = "stop" ]; then
71-
docker-compose -f 'docker-compose.yaml' -p 'wolf-rbac' down
81+
$COMPOSE_CMD -f 'docker-compose.yaml' -p 'wolf-rbac' down
7282
rm -rf db-psql.sql
7383
else
7484
echo "argument is one of [ip, start, stop]"

0 commit comments

Comments
 (0)