From ef891275191aea165d403f01cbb9856dc7a58079 Mon Sep 17 00:00:00 2001
From: Neil Cook <neil.cook@noware.co.uk>
Date: Tue, 6 Aug 2024 21:36:08 +0100
Subject: [PATCH] Move from docker-compose (V1) to docker compose (V2)
 everywhere

---
 configure.ac                    | 4 ++--
 docker/Makefile.am              | 4 ++--
 docker/wforce_image/Makefile.am | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 30b3b45c..c53e00c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,9 +197,9 @@ AC_ARG_ENABLE([docker],
   *) AC_MSG_ERROR([bad value ${enableval} for --enable-docker]) ;;
 esac],[docker=false])
 AM_CONDITIONAL([WITH_DOCKER], [test x$docker = xtrue])
-AC_CHECK_PROG(DOCKER, docker-compose, docker-compose)
+AC_CHECK_PROG(DOCKER, docker, docker)
 AS_IF([test x$docker = xtrue -a "x$DOCKER" = "x"], [
-    AC_MSG_ERROR([docker-compose not found, and is required])
+    AC_MSG_ERROR([docker not found, and is required])
 ])
 AC_ARG_ENABLE([trackalert],
 [  --enable-trackalert         Build trackalert],
diff --git a/docker/Makefile.am b/docker/Makefile.am
index 3e22356b..7f44347c 100644
--- a/docker/Makefile.am
+++ b/docker/Makefile.am
@@ -1,4 +1,4 @@
-DCMP = docker-compose
+DCMP = docker compose
 COMPOSE_SOURCE = docker-compose.yml logstash/Dockerfile logstash/config/logstash.conf logstash/templates/wforce_template.json regression/Dockerfile wforce_image/Dockerfile wforce_image/docker-entrypoint.sh wforce_image/wforce.conf.j2 wforce_image/create_config.sh
 COMPOSE_TARGET = .docker
 REGRESSION_SERVICE = regression
@@ -27,7 +27,7 @@ clean_elastic: stop
 	rm $(COMPOSE_TARGET)
 
 clean_docker:
-	docker-compose down -v
+	$(DCMP) down -v
 
 clean: clean_docker
 
diff --git a/docker/wforce_image/Makefile.am b/docker/wforce_image/Makefile.am
index a4841a51..6bbda427 100644
--- a/docker/wforce_image/Makefile.am
+++ b/docker/wforce_image/Makefile.am
@@ -1,4 +1,4 @@
-DCMP = docker-compose
+DCMP = docker compose
 WFORCE_IMAGE_COMPOSE_TARGET = .wforce_image_docker
 WFORCE_IMAGE_SERVICE = wforce_image
 WFORCE_MINIMAL_IMAGE_SERVICE = wforce_minimal
@@ -27,7 +27,7 @@ kill:
 	$(DCMP) kill
 
 clean_docker:
-	docker-compose down -v
+	$(DCMP) down -v
 
 clean: clean_docker