diff --git a/backup.sh b/backup.sh index 6d9f1a2..46c1566 100755 --- a/backup.sh +++ b/backup.sh @@ -60,9 +60,9 @@ if [ ! -z "$BACKUP_BUCKET_NAME" ]; then TIME_UPLOADED="$(date +%s.%N)" fi -if [ ! -z "$BACKUP_ARCHIVE_PATH" ]; then +if [ ! -z "$BACKUP_ARCHIVE" ]; then info "Archiving backup" - mv -v "$BACKUP_FILENAME" "$BACKUP_ARCHIVE_PATH/$BACKUP_FILENAME" + mv -v "$BACKUP_FILENAME" "$BACKUP_ARCHIVE/$BACKUP_FILENAME" fi if [ -f "$BACKUP_FILENAME" ]; then diff --git a/entrypoint.sh b/entrypoint.sh index e6c9a8e..a5be5e7 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -9,7 +9,7 @@ BACKUP_SOURCES="${BACKUP_SOURCES:-/backup}" BACKUP_CRON_EXPRESSION="${BACKUP_CRON_EXPRESSION:-@daily}" BACKUP_BUCKET_NAME="${BACKUP_BUCKET_NAME:-}" BACKUP_FILENAME="$(date +"${BACKUP_FILENAME:-latest.tar.gz}")" -BACKUP_ARCHIVE_PATH="${BACKUP_ARCHIVE_PATH}" +BACKUP_ARCHIVE="${BACKUP_ARCHIVE}" BACKUP_WAIT_SECONDS="${BACKUP_WAIT_SECONDS:-0}" BACKUP_HOSTNAME="${BACKUP_HOSTNAME:-$(hostname)}" DOCKER_STOP_OPT_IN_LABEL="${DOCKER_STOP_OPT_IN_LABEL:-docker-volume-backup-companion.stop-during-backup}"