From 8eecd7d41efa0f513834989436f870f241336915 Mon Sep 17 00:00:00 2001 From: Vassiliy Yegorov Date: Wed, 14 Dec 2022 14:32:46 +0700 Subject: [PATCH] fix --- assets/usr/local/sbin/backup.sh | 21 ++++++++++----------- run-test.sh | 7 +++++-- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/assets/usr/local/sbin/backup.sh b/assets/usr/local/sbin/backup.sh index 478c92f..b0d310d 100755 --- a/assets/usr/local/sbin/backup.sh +++ b/assets/usr/local/sbin/backup.sh @@ -35,17 +35,16 @@ case $DBTYPE in ;; esac -# case $STORAGE_TYPE in -# s3) -# log "Storage type is " -# source storage/s3.sh -# ;; -# *) -# log_error "Unknown storage, known " -# exit 1 -# ;; -# esac -STORAGE_TYPE=s3 +case $STORAGE_TYPE in + s3) + log "Storage type is " + source storage/s3.sh + ;; + *) + log_error "Unknown storage, known " + exit 1 + ;; +esac TIME=`date +%Y-%m-%d-%H-%M` ARCHIVE="/srv/backup/""$PROJECT_NAME"_$TIME".$EXT_DB" diff --git a/run-test.sh b/run-test.sh index 3d25b1c..fefb58a 100755 --- a/run-test.sh +++ b/run-test.sh @@ -1,6 +1,9 @@ #!/bin/bash -source .env +image=hub.realmanual.ru/images/backup-2/backup:latest -docker run --rm --env-file .env --network dalarmbot_net --name test_backup hub.realmanual.ru/images/backup-2:latest +source .env +docker pull $image + +docker run --rm --env-file .env --network dalarmbot_net --name test_backup $image echo "Backup create and save to ${STORAGE_HOST}/${STORAGE_PATH}"