Migrate docker compose to new format

wodby · Aug 7, 2024 · dfbe549 · dfbe549
1 parent 4d59880
commit dfbe549
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git 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 → tests/compose.yml b/tests/docker-compose.yml → 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
@@ -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