diff --git a/README.md b/README.md index 62cb3c2..37e5062 100644 --- a/README.md +++ b/README.md @@ -208,6 +208,8 @@ How to make a release: [RELEASE.md](RELEASE.md) - As for script utilities, one needs `bash`, `jq`, `zip`, `unzip` and `curl`. +Please make sure, that docker including the docker compose plugin is installed. The setup works with docker `v26.1.3` and docker compose `v2.27.0`, + Running the tests will download the protoc binaries on the first invocation automatically. For development the `generated-local.Dockerfile` (via [generate-local.Dockerfile.sh](dev/generate-local.Dockerfile.sh)) is used. diff --git a/test/servers/compose.yml b/test/servers/compose.yml index 775ab3b..0c08250 100644 --- a/test/servers/compose.yml +++ b/test/servers/compose.yml @@ -1,5 +1,3 @@ -version: "3.9" - services: server: diff --git a/test/suite/setup.sh b/test/suite/setup.sh index e06bfa4..2e5543d 100755 --- a/test/suite/setup.sh +++ b/test/suite/setup.sh @@ -59,14 +59,14 @@ export -f buildProtocurl startServer() { echo 'Starting server...' && - docker-compose -f test/servers/compose.yml up --build -d >/dev/null 2>&1 && + docker compose -f test/servers/compose.yml up --build -d >/dev/null 2>&1 && echo 'Done.' } export -f startServer stopServer() { echo 'Stopping server...' && - docker-compose -f test/servers/compose.yml down >/dev/null 2>&1 && + docker compose -f test/servers/compose.yml down >/dev/null 2>&1 && echo 'Done.' } export -f stopServer @@ -74,7 +74,7 @@ export -f stopServer isServerReady() { rm -rf tmpfile.log || true - docker-compose -f test/servers/compose.yml logs >tmpfile.log + docker compose -f test/servers/compose.yml logs >tmpfile.log if [[ "$?" == 1 ]]; then echo "Aborting as server status could not be fetched"