From 121cb75197e916b129580d4823aa712d48f9f628 Mon Sep 17 00:00:00 2001
From: Jonathan Crooke <mail@jcrooke.net>
Date: Mon, 1 Jul 2024 14:56:06 +0100
Subject: [PATCH] Migrate to docker compose plugin

---
 README.md       | 6 +++---
 build/bin/track | 2 +-
 hooks/build     | 2 +-
 hooks/test      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index b1b1281..93a195a 100644
--- a/README.md
+++ b/README.md
@@ -47,9 +47,9 @@ services:
 ```
 
 * Run the build
-  * `docker-compose build .`
-  * If using `extends`: `docker-compose -f docker-compose.build.yml build`
-* Start the container: `docker-compose up -d`
+  * `docker compose build .`
+  * If using `extends`: `docker compose -f docker compose.build.yml build`
+* Start the container: `docker compose up -d`
 * Initally test the build by connecting to the ispconfig control panel: `http://<localhost>:8080`
 * Do addition verification!
 * Ideally, push your image to Docker Cloud
diff --git a/build/bin/track b/build/bin/track
index 7f4e97b..590958e 100755
--- a/build/bin/track
+++ b/build/bin/track
@@ -6,7 +6,7 @@ echo "dfasf"
   rm -rf .git
   git init
   git add --all
-  git commit -m "docker-compose track : initial checkin" >/dev/null
+  git commit -m "docker compose track : initial checkin" >/dev/null
   exit 0
 fi
 
diff --git a/hooks/build b/hooks/build
index 7e1e410..326ea62 100755
--- a/hooks/build
+++ b/hooks/build
@@ -6,4 +6,4 @@ OPTIONS=()
 source "$DIR/pre_build"
 
 [ -t 1 ] && OPTIONS+=(--progress tty)
-docker-compose -f "$DIR/../build/docker-compose.build.yml" build "${OPTIONS[@]}" "$@"
+docker compose -f "$DIR/../build/docker compose.build.yml" build "${OPTIONS[@]}" "$@"
diff --git a/hooks/test b/hooks/test
index 291d068..672979c 100755
--- a/hooks/test
+++ b/hooks/test
@@ -10,8 +10,8 @@ export CONTAINER="ispconfig-test"
 
 function buildAndTest() {
   YML=$1
-  UP="docker-compose -f test/$YML up --build --abort-on-container-exit --force-recreate --remove-orphans sut"
-  DOWN="docker-compose -f test/$YML down -v"
+  UP="docker compose -f test/$YML up --build --abort-on-container-exit --force-recreate --remove-orphans sut"
+  DOWN="docker compose -f test/$YML down -v"
 
   if ! $UP; then
     echo "Failed: \"$UP\""