From 5ddbac8988621b7652983d01ab938a4ff19c737b Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 24 Sep 2024 15:32:43 -0700 Subject: [PATCH] Support docker-compose v2 in test setup script This supports the new docker compose plugin. Change-Id: I00f0bd6ca0cc65b8a7f0535c03800f76a85a5776 --- tools/test-setup-docker.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/test-setup-docker.sh b/tools/test-setup-docker.sh index dcd588725..19f273c69 100755 --- a/tools/test-setup-docker.sh +++ b/tools/test-setup-docker.sh @@ -33,6 +33,8 @@ fi # Select docker-compose or podman-compose if command -v docker-compose > /dev/null; then COMPOSE=docker-compose +elif docker compose --help > /dev/null; then + COMPOSE="docker compose" elif command -v podman-compose > /dev/null; then COMPOSE=podman-compose else