chore: merge branch 'main' into main-v1beta2

uselagoon · Aug 8, 2024 · 56a2e9e · 56a2e9e
2 parents 34e136f + 62f368a
commit 56a2e9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -48,18 +48,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