diff --git a/Dockerfile b/Dockerfile index c177a2a..0e332f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,6 @@ RUN unzip rclone-current-linux-amd64.zip && mv rclone-*-linux-amd64/rclone /bin/ FROM restic/restic:0.9.6 -# install mailx RUN apk add --update --no-cache heirloom-mailx fuse curl COPY --from=rclone /bin/rclone /bin/rclone diff --git a/backup.sh b/backup.sh index 8af464d..66f3807 100755 --- a/backup.sh +++ b/backup.sh @@ -32,18 +32,17 @@ logLast "AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}" # Do not save full backup log to logfile but to backup-last.log restic backup /data ${RESTIC_JOB_ARGS} --tag=${RESTIC_TAG?"Missing environment variable RESTIC_TAG"} >> ${lastLogfile} 2>&1 -rc=$? +backupRC=$? logLast "Finished backup at $(date)" -if [[ $rc == 0 ]]; then - echo "Backup Successfull" +if [[ $backupRC == 0 ]]; then + echo "Backup Successfull" else - echo "Backup Failed with Status ${rc}" + echo "Backup Failed with Status ${backupRC}" restic unlock copyErrorLog - exit 1 fi -if [ -n "${RESTIC_FORGET_ARGS}" ]; then +if [[ $backupRC == 0 ]] && [ -n "${RESTIC_FORGET_ARGS}" ]; then echo "Forget about old snapshots based on RESTIC_FORGET_ARGS = ${RESTIC_FORGET_ARGS}" restic forget ${RESTIC_FORGET_ARGS} >> ${lastLogfile} 2>&1 rc=$? @@ -83,7 +82,7 @@ fi if [ -f "/hooks/post-backup.sh" ]; then echo "Starting post-backup script ..." - /hooks/post-backup.sh + /hooks/post-backup.sh $backupRC else echo "Post-backup script not found ..." fi