* - use "docker compose" not "docker-compose"

Latter is obsolete now

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')}}"

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 || {
+docker compose down --remove-orphans || {
-    echo "ERROR: Couldn't stop docker-compose, restarting and aborting"
+    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 || {
+docker compose up -d main-services || {
-    echo "ERROR: couldn't restart docker-compose services, aborting with no 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"

templates/bin/borg

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec docker-compose run -- borgmatic borg "$@"
+exec docker compose run -- borgmatic borg "$@"

templates/bin/borgmatic

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec docker-compose run -- borgmatic borgmatic "$@"
+exec docker compose run -- borgmatic borgmatic "$@"

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() {