docker-compose.yml

@@ -5,6 +5,8 @@ services:
         build: ./rsnapshot
         container_name: rsnapshot-rsnapshot
 #        restart: unless-stopped
+#        hostname: rsnapshot
+#        domainname: example.com
         networks:
             rsnapshot.internal.docker:
                 aliases:

env

@@ -1,3 +1,5 @@
+TZ=Europe/London
+
 SSMTP_ROOT=root@example.com
 SSMTP_MAILHUB=172.17.0.1:10025
 SSMTP_MAILDOMAIN=example.com

rsnapshot/Dockerfile

@@ -1,4 +1,4 @@
-FROM robinthoni/debian-multiarch:jessie
+FROM debian:stretch
 
 ARG CONFIG_DIR=/etc/default/config-files/
 
@@ -7,7 +7,7 @@ RUN apt-get update &&\
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     rm /etc/cron.*/*
 
-RUN wget -O /tmp/rclone.deb 'https://downloads.rclone.org/v1.41/rclone-v1.41-linux-amd64.deb' && \
+RUN wget -O /tmp/rclone.deb 'https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb' && \
     dpkg -i /tmp/rclone.deb && rm /tmp/rclone.deb
 
 COPY ./vars-vars /etc/vars-vars

rsnapshot/config/rsnapshot.conf

@@ -252,9 +252,8 @@ lockfile	/var/run/rsnapshot.pid
 # RSYNC.SAMBA.ORG
 #backup	rsync://rsync.samba.org/rsyncftp/	rsync.samba.org/rsyncftp/
 
-backup_script	/bin/date "+ backup started at %c" | /usr/bin/tee date	backup_start_date
+backup_script	/bin/date "+backup started at %c" | /usr/bin/tee date	backup_start_date
 
 include_conf	/etc/rsnapshot/user_backup.conf
 
-backup_script	/bin/date "+ backup ended at %c" | /usr/bin/tee date	backup_end_date
-
+backup_script	/bin/date "+backup ended at %c" | /usr/bin/tee date	backup_end_date

rsnapshot/config/rsnapshot.cron.conf

@@ -5,7 +5,7 @@
 # To activate this cron file you have to uncomment the lines below.
 # Feel free to adapt it to your needs.
 
-# 00 */4		* * *		root	/usr/bin/rsnapshot hourly
- 00  3  	* * *		root	/usr/bin/rsnapshot daily
- 50  2  	* * 1		root	/usr/bin/rsnapshot weekly
- 55  2  	1 * *		root	/usr/bin/rsnapshot monthly
+# 00 */4		* * *		root	. /tmp/env; /usr/bin/rsnapshot hourly
+ 00  3  	* * *		root	. /tmp/env; /usr/bin/rsnapshot daily
+ 55  2  	* * 1		root	. /tmp/env; /usr/bin/rsnapshot weekly
+ 50  2  	1 * *		root	. /tmp/env; /usr/bin/rsnapshot monthly

rsnapshot/config/ssmtp.conf

@@ -16,4 +16,4 @@ rewriteDomain=SSMTP_MAILDOMAIN
 #hostname=
 
 # Are users allowed to set their own From: address? (YES/NO)
-FromLineOverride=YES
+FromLineOverride=NO

rsnapshot/run.sh

@@ -4,4 +4,6 @@
 
 replace_files
 
-cron -f
+env | grep -Ev 'BASHOPTS|BASH_VERSINFO|EUID|PPID|SHELLOPTS|UID' | sed 's/^\(.*\)$/export \1/' > /tmp/env
+
+cron -fn