Skip to content

Commit

Permalink
Upgrade to docker compose plugin instead of docker-compose.
Browse files Browse the repository at this point in the history
  • Loading branch information
GollyTicker committed May 25, 2024
1 parent 335496f commit a4ffc81
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions test/servers/compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

services:

server:
Expand Down
6 changes: 3 additions & 3 deletions test/suite/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,22 @@ 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

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"
Expand Down

0 comments on commit a4ffc81

Please sign in to comment.