From 832d2adb8587c5503b201b56d48c0abbd5fa82a9 Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Thu, 8 Aug 2024 11:04:57 +1000 Subject: [PATCH] chore: use docker compose instead of docker-compose --- Makefile | 2 +- controller-test.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9a4c9409..0de3f389 100644 --- a/Makefile +++ b/Makefile @@ -114,7 +114,7 @@ controller-test: ./controller-test.sh clean: - docker-compose down + docker compose down kind delete cluster --name ${KIND_NAME} local-circle: diff --git a/controller-test.sh b/controller-test.sh index 014247c9..ba73b6ea 100755 --- a/controller-test.sh +++ b/controller-test.sh @@ -45,18 +45,18 @@ tear_down () { echo "==> Remove cluster" kind delete cluster --name ${KIND_NAME} echo "==> Remove services" - docker-compose down + docker compose down } start_docker_compose_services () { echo "================ BEGIN ================" echo "==> Bring up local provider" - docker-compose up -d + docker compose up -d CHECK_COUNTER=1 } mariadb_start_check () { - until $(docker-compose exec -T mysql mysql --host=local-dbaas-mariadb-provider --port=3306 -uroot -e 'show databases;' | grep -q "information_schema") + until $(docker compose exec -T mysql mysql --host=local-dbaas-mariadb-provider --port=3306 -uroot -e 'show databases;' | grep -q "information_schema") do if [ $CHECK_COUNTER -lt $CHECK_TIMEOUT ]; then let CHECK_COUNTER=CHECK_COUNTER+1