Skip to content

Commit a4ffc81

Browse files
committed
Upgrade to docker compose plugin instead of docker-compose.
1 parent 335496f commit a4ffc81

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Diff for: README.md

+2
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ How to make a release: [RELEASE.md](RELEASE.md)
208208

209209
- As for script utilities, one needs `bash`, `jq`, `zip`, `unzip` and `curl`.
210210

211+
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`,
212+
211213
Running the tests will download the protoc binaries on the first invocation automatically.
212214

213215
For development the `generated-local.Dockerfile` (via [generate-local.Dockerfile.sh](dev/generate-local.Dockerfile.sh)) is used.

Diff for: test/servers/compose.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.9"
2-
31
services:
42

53
server:

Diff for: test/suite/setup.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,22 @@ export -f buildProtocurl
5959

6060
startServer() {
6161
echo 'Starting server...' &&
62-
docker-compose -f test/servers/compose.yml up --build -d >/dev/null 2>&1 &&
62+
docker compose -f test/servers/compose.yml up --build -d >/dev/null 2>&1 &&
6363
echo 'Done.'
6464
}
6565
export -f startServer
6666

6767
stopServer() {
6868
echo 'Stopping server...' &&
69-
docker-compose -f test/servers/compose.yml down >/dev/null 2>&1 &&
69+
docker compose -f test/servers/compose.yml down >/dev/null 2>&1 &&
7070
echo 'Done.'
7171
}
7272
export -f stopServer
7373

7474
isServerReady() {
7575
rm -rf tmpfile.log || true
7676

77-
docker-compose -f test/servers/compose.yml logs >tmpfile.log
77+
docker compose -f test/servers/compose.yml logs >tmpfile.log
7878

7979
if [[ "$?" == 1 ]]; then
8080
echo "Aborting as server status could not be fetched"

0 commit comments

Comments
 (0)