From 7c4f1091b4f39aa6264b93afc897e29b29de8580 Mon Sep 17 00:00:00 2001
From: Nick Stokoe <git.wu-lee@noodlefactory.co.uk>
Date: Sun, 25 May 2025 18:43:38 +0100
Subject: [PATCH] * - use "docker compose" not "docker-compose"

Latter is obsolete now
---
 snackpot.yml            |  2 +-
 templates/bin/backup    | 18 +++++++++---------
 templates/bin/borg      |  2 +-
 templates/bin/borgmatic |  2 +-
 templates/bin/ncadmin   |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/snackpot.yml b/snackpot.yml
index 75feb29..4f0e706 100644
--- a/snackpot.yml
+++ b/snackpot.yml
@@ -12,7 +12,7 @@
     navidrome_hostname: nd.noodlefactory.co.uk
     letsencrypt_email: webmaster@noodlefactory.co.uk
     docker_compose_base_dir: /opt/docker-compose
-    docker_compose_cmd: docker-compose
+    docker_compose_cmd: docker compose
     borg_passphrase: "{{lookup('passwordstore', 'servers/snackpot/borg.passphrase')}}"
     smtp_password: "{{lookup('passwordstore', 'servers/snackpot/smtp.password')}}"
     borg_ssh_key: "{{lookup('passwordstore', 'servers/snackpot/borg.id_rsa')}}"
diff --git a/templates/bin/backup b/templates/bin/backup
index dbfd82b..41c9c38 100755
--- a/templates/bin/backup
+++ b/templates/bin/backup
@@ -8,22 +8,22 @@ set -o errexit
 cd "/opt/docker-compose"
 
 set -vx
-docker-compose exec -T -u www-data nextcloud ./occ maintenance:mode --on ||
+docker compose exec -T -u www-data nextcloud ./occ maintenance:mode --on ||
     echo "WARNING: Couldn't stop nextcloud container, proceeding anyway"
-docker-compose down --remove-orphans || {
-    echo "ERROR: Couldn't stop docker-compose, restarting and aborting"
+docker compose down --remove-orphans || {
+    echo "ERROR: Couldn't stop docker compose, restarting and aborting"
     docker network prune --force
-    docker-compose up -d
+    docker compose up -d
     exit
 }
 docker network prune --force # remove dangling networks
-docker-compose run --name borgmatic -T --rm borgmatic  /backup.sh run ||
+docker compose run --name borgmatic -T --rm borgmatic  /backup.sh run ||
     echo "ERROR: Couldn't run borgmatic"
-docker-compose up -d main-services || {
-    echo "ERROR: couldn't restart docker-compose services, aborting with no services!"
+docker compose up -d main-services || {
+    echo "ERROR: couldn't restart docker compose services, aborting with no services!"
     exit 1
 }
-docker-compose exec -T -u www-data nextcloud ./occ maintenance:mode --off ||
+docker compose exec -T -u www-data nextcloud ./occ maintenance:mode --off ||
     echo "Couldn't turn off nextcloud's maintainance mode"
-docker-compose run --name borgmatic -T --rm borgmatic  /backup.sh check ||
+docker compose run --name borgmatic -T --rm borgmatic  /backup.sh check ||
     echo "Couldn't run the bormatic backup check"
diff --git a/templates/bin/borg b/templates/bin/borg
index 5169297..9cb061c 100755
--- a/templates/bin/borg
+++ b/templates/bin/borg
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec docker-compose run -- borgmatic borg "$@"
+exec docker compose run -- borgmatic borg "$@"
diff --git a/templates/bin/borgmatic b/templates/bin/borgmatic
index 2b7fb1c..1d4b61a 100755
--- a/templates/bin/borgmatic
+++ b/templates/bin/borgmatic
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec docker-compose run -- borgmatic borgmatic "$@"
+exec docker compose run -- borgmatic borgmatic "$@"
diff --git a/templates/bin/ncadmin b/templates/bin/ncadmin
index 239e187..fb74675 100755
--- a/templates/bin/ncadmin
+++ b/templates/bin/ncadmin
@@ -8,7 +8,7 @@ nextcloud_db_user={{ nextcloud_db_user }}
 nextcloud_db={{ nextcloud_db }}
 
 DOCKER_EXE() {
-    ( cd $dc_dir; docker-compose exec "$@" )
+    ( cd $dc_dir; docker compose exec "$@" )
 }
 
 ON_POSTGRES() {