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

Latter is obsolete now
This commit is contained in:
Nick Stokoe
2025-05-25 18:43:38 +01:00
parent b26ac645bd
commit 7c4f1091b4
5 changed files with 13 additions and 13 deletions

View File

@@ -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"

View File

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

View File

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

View File

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