From ace7c92c82c3e20a8046534faa7f2920945e7c56 Mon Sep 17 00:00:00 2001
From: Chris Hubbard <chris@thehubbards.org>
Date: Wed, 27 Nov 2024 11:50:36 -0500
Subject: [PATCH] Remove explicit call to docker-compose

---
 .github/workflows/main.yml |  9 ++++-----
 Makefile                   | 36 ++++++++++++++++++------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 41df577..1e1823b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,7 +26,6 @@ jobs:
         run: |
           echo Docker version
           docker --version
-          docker-compose --version
           echo
           echo Env
           env
@@ -60,11 +59,11 @@ jobs:
           tags: |
             ghcr.io/sillsdev/appbuilder-buildengine-api:${{ steps.branch.outputs.DockerTag }}
           context: .
-      
+
       - name: Clean up older packages
         uses: actions/delete-package-versions@v4
         with:
-          package-name: 'appbuilder-buildengine-api'
-          package-type: 'container'
+          package-name: "appbuilder-buildengine-api"
+          package-type: "container"
           min-versions-to-keep: 6
-          delete-only-untagged-versions: 'true'
+          delete-only-untagged-versions: "true"
diff --git a/Makefile b/Makefile
index bab57aa..bfa7198 100644
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,55 @@
 start: app
 
 test: clean testSh composer rmTestDb upTestDb yiimigratetestDb rmTestDb
-	docker-compose run --rm cli bash -c 'MYSQL_HOST=testDb MYSQL_DATABASE=test ./vendor/bin/codecept --debug run unit'
+	docker compose run --rm cli bash -c 'MYSQL_HOST=testDb MYSQL_DATABASE=test ./vendor/bin/codecept --debug run unit'
 
 testSh:
 	shellcheck application/console/views/cron/scripts/upload/default/*.sh
 
 app: upDb composer yiimigrate adminer
-	docker-compose up -d cron web
+	docker compose up -d cron web
 
 composer:
-	docker-compose run --rm --user="0:0" cli composer install
+	docker compose run --rm --user="0:0" cli composer install
 
 composerupdate:
-	docker-compose run --rm --user="0:0" cli composer update
+	docker compose run --rm --user="0:0" cli composer update
 
 cli:
-	docker-compose run --rm --user="0:0" cli bash
+	docker compose run --rm --user="0:0" cli bash
 
 rmDb:
-	docker-compose kill db
-	docker-compose rm -f db
+	docker compose kill db
+	docker compose rm -f db
 
 upDb:
-	docker-compose up -d db
+	docker compose up -d db
 
 yiimigrate:
-	docker-compose run --rm cli whenavail db 3306 100 ./yii migrate --interactive=0
+	docker compose run --rm cli whenavail db 3306 100 ./yii migrate --interactive=0
 
 basemodels:
-	docker-compose run --rm cli whenavail db 3306 100 ./rebuildbasemodels.sh
+	docker compose run --rm cli whenavail db 3306 100 ./rebuildbasemodels.sh
 
 yiimigratetestDb:
-	docker-compose run --rm cli bash -c 'MYSQL_HOST=testDb MYSQL_DATABASE=test whenavail testDb 3306 100 ./yii migrate --interactive=0'
+	docker compose run --rm cli bash -c 'MYSQL_HOST=testDb MYSQL_DATABASE=test whenavail testDb 3306 100 ./yii migrate --interactive=0'
 
 rmTestDb:
-	docker-compose kill testDb
-	docker-compose rm -f testDb
+	docker compose kill testDb
+	docker compose rm -f testDb
 
 upTestDb:
-	docker-compose up -d testDb
+	docker compose up -d testDb
 
 bounce:
-	docker-compose up -d cron web
+	docker compose up -d cron web
 
 clean:
-	docker-compose kill
-	docker-compose rm -f
+	docker compose kill
+	docker compose rm -f
 
 cleanVolumes:
 	docker volume rm `docker volume ls -qf dangling=true`
 
 adminer:
-	docker-compose up -d adminer
+	docker compose up -d adminer