From 7b87281dcd7ae282b1cdd9c37d91efe7273d77f6 Mon Sep 17 00:00:00 2001
From: Matthias Bilger <matthias@bilger.info>
Date: Thu, 10 Oct 2019 17:27:08 +0200
Subject: [PATCH] use real tar

---
 Dockerfile |  5 +++--
 backup.sh  | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 91653c2..5f33729 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,10 @@
-FROM alpine:3.4
-MAINTAINER technik@myfoodmap.de
+FROM alpine:3.10
+MAINTAINER matthias@bilger.info
 
 RUN apk add --update \
     py-pip \
     gpgme \
+    tar \
     sed \
     xz \
     && rm -rf /var/cache/apk/*
diff --git a/backup.sh b/backup.sh
index 6145ff7..7d87b05 100644
--- a/backup.sh
+++ b/backup.sh
@@ -1,19 +1,29 @@
 #!/bin/sh
 
 BACKUP_DATE=$(date +"%Y-%m-%d_%H-%M")
+BACKUP_BASENAME=$S3_BUCKET_NAME$BACKUP_DATE.tar
+SKIP_XZ=${ONLY_TAR:0}
+
+if [ $SKIP_XZ -ne 0 ]; then
+  TAR_PARAM=
+  BACKUP_FILENAME=$BACKUP_BASENAME
+else
+  TAR_PARAM=-J
+  BACKUP_FILENAME=$BACKUP_BASENAME.xz
+fi
 
 cd /backup
 echo "make archive"
-tar -c --checkpoint=.1000 -Jf ~/$S3_BUCKET_NAME$BACKUP_DATE.tar.xz ./*
+tar -c --checkpoint=.1000 ${TAR_PARAM} -f ~/$BACKUP_FILENAME ./*
 cd /
 
 RECIPIENT=$(echo "$GPG_RECIPIENT" | sed "s/,/ --recipient /")
 
 echo "encrypting"
-gpg --trust-model always --enable-progress-filter --output ~/$S3_BUCKET_NAME$BACKUP_DATE.tar.xz.gpg --encrypt --recipient $RECIPIENT ~/$S3_BUCKET_NAME$BACKUP_DATE.tar.xz
-rm ~/$S3_BUCKET_NAME$BACKUP_DATE.tar.xz
+gpg --trust-model always --enable-progress-filter --output ~/$BACKUP_FILENAME.gpg --encrypt --recipient $RECIPIENT ~/$BACKUP_FILENAME
+rm ~/$BACKUP_FILENAME
 
 echo "uploading"
-aws s3 cp ~/$S3_BUCKET_NAME$BACKUP_DATE.tar.xz.gpg s3://$S3_BUCKET_NAME/$S3_BUCKET_NAME$BACKUP_DATE.tar.xz.gpg --storage-class STANDARD_IA
-rm ~/$S3_BUCKET_NAME$BACKUP_DATE.tar.xz.gpg
+aws s3 cp ~/$BACKUP_FILENAME.gpg s3://$S3_BUCKET_NAME/$BACKUP_FILENAME.gpg --storage-class STANDARD_IA
+rm ~/$BACKUP_FILENAME.gpg
 echo "done"