* - use "docker compose" not "docker-compose"
Latter is obsolete now
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
#!/bin/sh
|
||||
exec docker-compose run -- borgmatic borg "$@"
|
||||
exec docker compose run -- borgmatic borg "$@"
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
#!/bin/sh
|
||||
exec docker-compose run -- borgmatic borgmatic "$@"
|
||||
exec docker compose run -- borgmatic borgmatic "$@"
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user