From 0c2b227a5cfbb978377f493e09e88f89e40d8713 Mon Sep 17 00:00:00 2001
From: Ian Stride <ianstride@gmail.com>
Date: Tue, 13 Aug 2024 11:08:05 +0100
Subject: [PATCH] Correct docker compose command

Github Actions no longer recognises 'docker-compose'.
---
 Makefile | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 843b4eb1f..56a4d203c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,32 @@
 IOGT_TEST_PARALLEL ?= 1
 
-# Build the project
 build:
-	docker-compose build
+	docker compose build
 down:
-	docker-compose down
+	docker compose down
 makemigrations:
-	docker-compose run django python manage.py makemigrations
+	docker compose run django python manage.py makemigrations
 migrate:
-	docker-compose run django python manage.py migrate
+	docker compose run django python manage.py migrate
 setup:
 	make migrate
 	make update_elasticsearch_index
 up:
-	docker-compose up
+	docker compose up
 update_elasticsearch_index:
-	docker-compose run django python manage.py update_index
+	docker compose run django python manage.py update_index
 compile-requirements:
-	docker-compose -f docker-compose.builder.yml run --rm builder
+	docker compose -f docker-compose.builder.yml run --rm builder
 test:
-	docker-compose -f docker-compose.test.yml up --build -d
-	docker-compose -f docker-compose.test.yml exec -T django python manage.py collectstatic --noinput
-	docker-compose -f docker-compose.test.yml exec -T django python manage.py test --noinput --parallel $(IOGT_TEST_PARALLEL)
-	docker-compose -f docker-compose.test.yml down --remove-orphans
+	docker compose -f docker-compose.test.yml up --build -d
+	docker compose -f docker-compose.test.yml exec -T django python manage.py collectstatic --noinput
+	docker compose -f docker-compose.test.yml exec -T django python manage.py test --noinput --parallel $(IOGT_TEST_PARALLEL)
+	docker compose -f docker-compose.test.yml down --remove-orphans
 selenium-test: selenium-up selenium-local selenium-down
 selenium-up:
-	docker-compose -f docker-compose.selenium.yml up --build -d --scale chrome=$(IOGT_TEST_PARALLEL)
-	docker-compose -f docker-compose.selenium.yml exec -T django python manage.py collectstatic --noinput
+	docker compose -f docker-compose.selenium.yml up --build -d --scale chrome=$(IOGT_TEST_PARALLEL)
+	docker compose -f docker-compose.selenium.yml exec -T django python manage.py collectstatic --noinput
 selenium-local:
-	docker-compose -f docker-compose.selenium.yml exec -T django python manage.py test selenium_tests --parallel $(IOGT_TEST_PARALLEL)
+	docker compose -f docker-compose.selenium.yml exec -T django python manage.py test selenium_tests --parallel $(IOGT_TEST_PARALLEL)
 selenium-down:
-	docker-compose -f docker-compose.selenium.yml down --remove-orphans
+	docker compose -f docker-compose.selenium.yml down --remove-orphans