pengm01 3 лет назад
Родитель
Сommit
4420859fb9
2 измененных файлов с 8 добавлено и 4 удалено
  1. 4 2
      docker_volume_backup.sh
  2. 4 2
      server_file_backup.sh

+ 4 - 2
docker_volume_backup.sh

@@ -5,12 +5,14 @@
 #set -ex
 
 SAVE_DIR=$1
-LOG_FILE=$SAVE_DIR/docker_volume_backup.log
+LOG_FILE=$HOME/logs/docker_volume_backup.log
 DATE=`date +"%Y%m%d_%H%M%S"`
 
 RETENTION=$((14*24*60))  # 2 weeks
 KEEP=7
 
+mkdir -p $HOME/logs
+
 echo "--------------------------$DATE------------------------" >> $LOG_FILE
 echo "[BEGIN] Backup docker volume" >> $LOG_FILE
 
@@ -18,7 +20,7 @@ echo "[BEGIN] Backup docker volume" >> $LOG_FILE
 volumes=( `docker volume ls | awk '{print $2}' | tail -n +2` )
 
 for x in "${volumes[@]}"; do
-  cmd="docker run --rm -it -v $x:/src -v $SAVE_DIR:/backup alpine tar -jpcf --ignore-failed-read /backup/$x_$DATE.tar.bz2 /src"
+  cmd="docker run --rm -it -v $x:/src -v $SAVE_DIR:/backup alpine tar --ignore-failed-read -jpcf /backup/$x_$DATE.tar.bz2 /src"
   echo $cmd >> $LOG_FILE
   eval $cmd
 done

+ 4 - 2
server_file_backup.sh

@@ -8,13 +8,15 @@
 BACKUP_DIR=$1
 SAVE_DIR=$2
 DATE=`date +"%Y%m%d_%H%M%S"`
-LOG_FILE=$SAVE_DIR/file_backup.log
+LOG_FILE=$HOME/logs/file_backup.log
 FILE_BASENAME=`echo $BACKUP_DIR | sed 's#/#_#g'`
 FILE_BASENAME=${FILE_BASENAME:1}
 
 RETENTION=$((14*24*60))  # 2 weeks
 KEEP=7
 
+mkdir -p $HOME/logs
+
 echo "--------------------------$DATE------------------------" >> $LOG_FILE
 echo "[BEGIN] Backup [$BACKUP_DIR]" >> $LOG_FILE
 
@@ -25,7 +27,7 @@ for x in "${exclude[@]}"; do
   exclude_options+=(--exclude="$x")
 done
 
-tar_cmd="tar ${exclude_options[@]} -jpcf --ignore-failed-read $SAVE_DIR/$FILE_BASENAME.$DATE.tar.bz2 $BACKUP_DIR >> $LOG_FILE 2>&1"
+tar_cmd="tar ${exclude_options[@]} --ignore-failed-read -jpcf $SAVE_DIR/$FILE_BASENAME.$DATE.tar.bz2 $BACKUP_DIR >> $LOG_FILE 2>&1"
 echo $tar_cmd >> $LOG_FILE
 
 eval $tar_cmd