Skip to content

Commit

Permalink
Use docker compose instead of docker-compose.
Browse files Browse the repository at this point in the history
  • Loading branch information
zlogic committed Aug 27, 2024
1 parent 4a2940c commit 7fcc5a0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tests/integrationtest.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
set -eux
docker version
docker-compose version
docker compose version

echo "Downloading test project"
mkdir -p downloads
Expand Down
4 changes: 2 additions & 2 deletions tests/test-generic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "<title>Mendix</title>"; do sleep 5; done'

Expand All @@ -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

0 comments on commit 7fcc5a0

Please sign in to comment.