From 32350fa0161d847ae26fbf5e3a5cf42281026256 Mon Sep 17 00:00:00 2001
From: ahfeel <ahfeel@gmail.com>
Date: Wed, 23 Mar 2016 23:25:05 +0100
Subject: [PATCH 1/2] * Check if LAST_BACKUP is defined to be able to fetch
 back a specific backup instead of the last one.

---
 README.md  | 4 ++--
 restore.sh | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3e997d2..809b55a 100644
--- a/README.md
+++ b/README.md
@@ -48,10 +48,10 @@ RESTORE=false
 
 `dockup` will use your AWS credentials to create a new bucket with name as per the environment variable `S3_BUCKET_NAME`, or if not defined, using the default name `docker-backups.example.com`. The paths in `PATHS_TO_BACKUP` will be tarballed, gzipped, time-stamped and uploaded to the S3 bucket.
 
+If you want `dockup` to run as a cron task, you can set the environment variable `CRON_TIME` to the desired frequency, for example `CRON_TIME=0 0 * * *` to backup every day at midnight.
 
 ## Restore
-To restore your data simply set the `RESTORE` environment variable to `true` - this will restore the latest backup from S3 to your volume.
-
+To restore your data simply set the `RESTORE` environment variable to `true` - this will restore the latest backup from S3 to your volume. If you want to restore a specific backup instead of the last one, you can also set the environment variable `LAST_BACKUP` to the desired tarball name.
 
 ## A note on Buckets
 
diff --git a/restore.sh b/restore.sh
index 35ce640..a820af3 100755
--- a/restore.sh
+++ b/restore.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
-# Find last backup file
-: ${LAST_BACKUP:=$(aws s3 ls s3://$S3_BUCKET_NAME | awk -F " " '{print $4}' | grep ^$BACKUP_NAME | sort -r | head -n1)}
+if [ -n "${LAST_BACKUP}" ]; then
+  # Find last backup file
+  : ${LAST_BACKUP:=$(aws s3 ls s3://$S3_BUCKET_NAME | awk -F " " '{print $4}' | grep ^$BACKUP_NAME | sort -r | head -n1)}
+fi
 
 # Download backup from S3
 aws s3 cp s3://$S3_BUCKET_NAME/$LAST_BACKUP $LAST_BACKUP

From 2b0c7cd58cad1ca37039db2e699080d1aaa3f8c5 Mon Sep 17 00:00:00 2001
From: ahfeel <ahfeel@gmail.com>
Date: Wed, 23 Mar 2016 23:26:57 +0100
Subject: [PATCH 2/2] * Save environment and reload it when running backup.sh,
 otherwise backup would totally fail because cron run them from empty
 environment.

---
 run.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/run.sh b/run.sh
index 8af6650..0deab98 100755
--- a/run.sh
+++ b/run.sh
@@ -3,12 +3,13 @@
 if [[ "$RESTORE" == "true" ]]; then
   ./restore.sh
 else
-  ./backup.sh
-fi
-
-if [ -n "$CRON_TIME" ]; then
-  echo "${CRON_TIME} /backup.sh >> /dockup.log 2>&1" > /crontab.conf
-  crontab  /crontab.conf
-  echo "=> Running dockup backups as a cronjob for ${CRON_TIME}"
-  exec cron -f
-fi
+  if [ -n "$CRON_TIME" ]; then
+    env | grep -v 'affinity:container' | sed -e 's/^\([^=]*\)=\(.*\)/export \1="\2"/' > /env.conf # Save current environment
+    echo "${CRON_TIME} . /env.conf && /backup.sh >> /dockup.log 2>&1" > /crontab.conf
+    crontab  /crontab.conf
+    echo "=> Running dockup backups as a cronjob for ${CRON_TIME}"
+    exec cron -f
+  else
+    ./backup.sh
+  fi
+fi
\ No newline at end of file