From 95ce406c69271d64cbd4179cdff9bb8aa66775d2 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Tue, 8 Oct 2024 11:27:25 -0700
Subject: [PATCH] Update compose to use plugin rather than old compose

---
 Makefile                           | 18 +++++++++---------
 docker-compose.yml                 |  1 -
 itest/docker-compose.itest-env.yml |  1 -
 itest/docker-compose.itest.yml     |  1 -
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 8687784..17362da 100644
--- a/Makefile
+++ b/Makefile
@@ -36,22 +36,22 @@ test:
 # Run bootstrapped integration test
 .PHONY: itest-up
 itest-up:
-	docker-compose -f docker-compose.yml \
+	docker compose -f docker-compose.yml \
 		-f itest/docker-compose.itest.yml \
 		build
-	docker-compose -f docker-compose.yml \
+	docker compose -f docker-compose.yml \
 		-f itest/docker-compose.itest.yml \
 		up -d vaultwarden ldap
 
 .PHONY: itest-run
 itest-run:
-	docker-compose -f docker-compose.yml \
+	docker compose -f docker-compose.yml \
 		-f itest/docker-compose.itest.yml \
 		run ldap_sync
 
 .PHONY: itest-stop
 itest-stop:
-	docker-compose stop
+	docker compose stop
 
 .PHONY: itest
 itest: itest-up itest-run itest-stop
@@ -59,20 +59,20 @@ itest: itest-up itest-run itest-stop
 # Run bootstrapped integration test using env for config
 .PHONY: itest-env
 itest-env:
-	docker-compose -f docker-compose.yml \
+	docker compose -f docker-compose.yml \
 		-f itest/docker-compose.itest-env.yml \
 		build
-	docker-compose -f docker-compose.yml \
+	docker compose -f docker-compose.yml \
 		-f itest/docker-compose.itest-env.yml \
 		up -d vaultwarden ldap
-	docker-compose -f docker-compose.yml \
+	docker compose -f docker-compose.yml \
 		-f itest/docker-compose.itest-env.yml \
 		run ldap_sync
-	docker-compose stop
+	docker compose stop
 
 .PHONY: clean-itest
 clean-itest:
-	docker-compose down -v
+	docker compose down -v
 
 # Installs pre-commit hooks
 .PHONY: install-hooks
diff --git a/docker-compose.yml b/docker-compose.yml
index 95cee9b..1a54164 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,4 @@
 ---
-version: '3'
 services:
   ldap_sync:
     build:
diff --git a/itest/docker-compose.itest-env.yml b/itest/docker-compose.itest-env.yml
index d53818e..ab82fb1 100644
--- a/itest/docker-compose.itest-env.yml
+++ b/itest/docker-compose.itest-env.yml
@@ -1,5 +1,4 @@
 ---
-version: '3'
 services:
   ldap_sync:
     environment:
diff --git a/itest/docker-compose.itest.yml b/itest/docker-compose.itest.yml
index 1edce91..72b6332 100644
--- a/itest/docker-compose.itest.yml
+++ b/itest/docker-compose.itest.yml
@@ -1,5 +1,4 @@
 ---
-version: '3'
 services:
   ldap_sync:
     volumes: