From c51cd684e27148f85882e3aabddc02da764e927c Mon Sep 17 00:00:00 2001
From: Benjamin Dweck <bjdweck@gmail.com>
Date: Mon, 9 Nov 2020 14:25:54 +0200
Subject: [PATCH] fixed backup script to use full path to docker-compose for
 use in cron jobs

---
 backup.tar.gz     | Bin 0 -> 581 bytes
 scripts/backup.sh |  12 +++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 backup.tar.gz

diff --git a/backup.tar.gz b/backup.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..14fabeda0cd691aba69e5faaae05306884af06de
GIT binary patch
literal 581
zcmV-L0=oSliwFP!000001MQf-i_}0Az=I#nSt%kGB7rMJIPWr(Oa_IZc%6kHXdxCM
zA7eJV*<>#>$+{~RRyK+UUSVNnVXI<u&EXan)?%SH7RMF-0Tx!8%_-~$?kc%tIrjaU
z2~1#K_|1FsGOi`86{%d53`$5oW{i&cGg2wRSj8&QBn2rNRVA5}99K@lg%!)P6i1Pm
z^xm}jeTv)nFQT~2Juv7WY1(A}7-jwu)^NrCO{+E6{(0(@wFh$l<9R>9KUPT9{^vda
z`~GX(WG*HIoi|&F9r%vfV4dP?^abk^{G&1dMAtP*R*Ek@ojLb!81irBDLS_+{emny
zEvCqZk<G6kIJy4*$J5|(>)Ps<>-g5&Cr6PXE~0}kKfGA^zQtx8KTwRJ{I?QOi(<da
zT+<1B77D&6N5cQte?kd@`d<aZ^*`bww3>UJ)YIy}Lg|QqRnG>f{}sS3+m4y%Q?KcD
zU3IN-+a^hB^B|&KkJaN^ie0_wyD6<VngLDkq@38%n!6l@eiSauI((oYf9wA^b7Cec
z>i@Ly{x2&DkpC4h)c@^DAL{?)_T`Pvvrp3VoyAK_pC2W!;~o6<-RAZgc7L(gJ96{q
z)nf|}H{X2Y+e|&>ecaeOd#Js1<<;tg8>dekZy)Z>`ul*%<oVANn>(>@vvRJ12Je6V
z@&8{}73lw}VAOwh6gag%-T!i(M`7_b^7=o1?>FEdkNDSBqC)+zg1h%-9RUCU00000
T000000A=$FazZI>04M+eQn@AC

literal 0
HcmV?d00001

diff --git a/scripts/backup.sh b/scripts/backup.sh
index 6c132f6..fc0662e 100755
--- a/scripts/backup.sh
+++ b/scripts/backup.sh
@@ -2,15 +2,17 @@
 
 [ $# -lt 2 ] && { echo "Usage: $0 {backup|restore} BACKUP_FILENAME"; exit 1; }
 
+DOCKER_COMPOSE=/usr/bin/docker-compose
+
 backup_file=$2
 
 project_subscriber_volume_name=client_data
 project_tor_volume_name=tor_config
 tor_service=tor
 
-docker-compose --log-level WARNING up --no-start
+$DOCKER_COMPOSE --log-level WARNING up --no-start
 
-project_name=$(docker ps -a --no-trunc | grep $(docker-compose ps -q ${tor_service}) | awk '{ print $2; }' | awk -F "_" '{ print $1; }')
+project_name=$(docker ps -a --no-trunc | grep $($DOCKER_COMPOSE ps -q ${tor_service}) | awk '{ print $2; }' | awk -F "_" '{ print $1; }')
 
 project_volumes=$(docker volume ls -f name=$project_name | awk '{if (NR > 1) print $2"\n";}')
 
@@ -34,7 +36,7 @@ function backup {
 
 function restore {
 
-  docker-compose stop $tor_service
+  $DOCKER_COMPOSE stop $tor_service
 
   docker run --rm \
     -v $subscriber_volume:/data/subscriber \
@@ -43,7 +45,7 @@ function restore {
     ubuntu \
     tar -C / -xzvf /backup/backup.tar.gz
 
-  docker-compose start $tor_service
+  $DOCKER_COMPOSE start $tor_service
 }
 
-$1
\ No newline at end of file
+$1