From dfbe54962003b0b5e0d823b87d02a4b1832473ca Mon Sep 17 00:00:00 2001
From: Chingis Sandanov <chingis@chingis.io>
Date: Wed, 7 Aug 2024 10:48:11 +0300
Subject: [PATCH] Migrate docker compose to new format

---
 Makefile                                  | 2 +-
 tests/{docker-compose.yml => compose.yml} | 2 --
 tests/run.sh                              | 8 ++++----
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename tests/{docker-compose.yml => compose.yml} (93%)

diff --git a/Makefile b/Makefile
index 74fa951..98b2beb 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,6 @@ logs:
 
 clean:
 	-docker rm -f $(NAME)
-	-IMAGE=$(REPO):$(TAG) ES_VER=$(KIBANA_VER_MINOR) docker-compose -f tests/docker-compose.yml down -v
+	-IMAGE=$(REPO):$(TAG) ES_VER=$(KIBANA_VER_MINOR) docker compose -f tests/compose.yml down -v
 
 release: build push
diff --git a/tests/docker-compose.yml b/tests/compose.yml
similarity index 93%
rename from tests/docker-compose.yml
rename to tests/compose.yml
index 33f8682..1c2a592 100644
--- a/tests/docker-compose.yml
+++ b/tests/compose.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   elasticsearch:
     image: wodby/elasticsearch:$ES_VER
diff --git a/tests/run.sh b/tests/run.sh
index 4d1700a..99c015a 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -6,7 +6,7 @@ if [[ -n "${DEBUG}" ]]; then
     set -x
 fi
 
-docker-compose up -d
-docker-compose exec -T elasticsearch make check-ready wait_seconds=5 max_try=30 -f /usr/local/bin/actions.mk
-docker-compose exec -T kibana make check-ready wait_seconds=5 max_try=30 -f /usr/local/bin/actions.mk
-docker-compose down
+docker compose up -d
+docker compose exec -T elasticsearch make check-ready wait_seconds=5 max_try=30 -f /usr/local/bin/actions.mk
+docker compose exec -T kibana make check-ready wait_seconds=5 max_try=30 -f /usr/local/bin/actions.mk
+docker compose down