From fcbbaec451cff76225d32c15533197e5f8db8ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Trifir=C3=B2?= <dtrifiro@redhat.com>
Date: Tue, 20 Aug 2024 10:12:29 +0200
Subject: [PATCH] docker compose v2 migration

v2 uses `docker compose` instead of `docker-compose`.

Ubuntu gha runners now ship with v2 only, see
https://github.com/actions/runner-images/issues/9692
---
 test/compose/smoke-test.sh | 12 ++++++------
 test/smoke-test.py         |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/compose/smoke-test.sh b/test/compose/smoke-test.sh
index 1772b2b4..0227eb25 100755
--- a/test/compose/smoke-test.sh
+++ b/test/compose/smoke-test.sh
@@ -4,8 +4,8 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
 IMAGE="caikit-tgis-serving:dev"
 
-if ! command -v docker-compose &>/dev/null; then
-	echo "This requires docker-compose" 2>&1
+if ! command -v docker compose &>/dev/null; then
+	echo "This requires docker compose" 2>&1
 	exit 1
 fi
 
@@ -39,18 +39,18 @@ if [[ -n $CI ]]; then # Free up some space on CI
 	rm -rf ~/.cache/huggingface
 fi
 
-docker-compose up -d
+docker compose up -d
 
 pip install caikit-nlp-client
 
 echo -e "\n=== Testing endpoints..."
 if ! python ../smoke-test.py; then
 	echo -e "\n=== Container logs"
-	docker-compose logs
+	docker compose logs
 	echo -e "\n=== 👎 Test failed\n"
-	docker-compose down
+	docker compose down
 	exit 1
 fi
 
 echo -e "\n=== 👍 Test successful!\n"
-cd ${SCRIPT_DIR} && docker-compose down
+cd ${SCRIPT_DIR} && docker compose down
diff --git a/test/smoke-test.py b/test/smoke-test.py
index 684439ac..4434b767 100644
--- a/test/smoke-test.py
+++ b/test/smoke-test.py
@@ -58,7 +58,7 @@ async def main():
     inference_service_url = os.getenv("ISVC_URL")
 
     if not inference_service_url:
-        print("No inference service, assuming docker-compose test")
+        print("No inference service, assuming docker compose test")
         return await asyncio.gather(
             test_grpc(),
             test_http(),