From 7fcc5a09325f9589647941acdafb465cbc2ca689 Mon Sep 17 00:00:00 2001 From: Dmitry Zolotukhin Date: Tue, 27 Aug 2024 11:04:35 +0000 Subject: [PATCH] Use docker compose instead of docker-compose. --- tests/integrationtest.sh | 2 +- tests/test-generic.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integrationtest.sh b/tests/integrationtest.sh index 71a2db0..344941b 100755 --- a/tests/integrationtest.sh +++ b/tests/integrationtest.sh @@ -1,7 +1,7 @@ #!/bin/sh set -eux docker version -docker-compose version +docker compose version echo "Downloading test project" mkdir -p downloads diff --git a/tests/test-generic.sh b/tests/test-generic.sh index e7f85ac..63d3ef6 100755 --- a/tests/test-generic.sh +++ b/tests/test-generic.sh @@ -6,7 +6,7 @@ COMPOSEFILE=$1 TIMEOUT=180s echo "test.sh [TEST STARTED] starting docker-compose $COMPOSEFILE" -docker-compose -f $COMPOSEFILE up & +docker compose -f $COMPOSEFILE up & timeout $TIMEOUT bash -c 'until curl -s http://localhost:8080 | grep "Mendix"; do sleep 5; done' @@ -17,5 +17,5 @@ if [ $RETURN_CODE -eq "0" ]; then else echo "test.sh [TEST FAILED] App is not reachable in timeout delay $TIMEOUT for $COMPOSEFILE" fi -docker-compose -f $COMPOSEFILE kill +docker compose -f $COMPOSEFILE kill exit $RETURN_CODE