Merge branch 'timestamp' into 'master'

Timestamp

See merge request 1O/bitwarden_rs-backup!1

Dockerfile

@@ -8,6 +8,7 @@ COPY start.sh backup.sh /
 ENV DB_FILE /data/db.sqlite3
 ENV BACKUP_FILE /data/db-backup.sqlite3
 ENV CRON_TIME "0 5 * * *"
+ENV TIMESTAMP false
 
 RUN chmod 700 /start.sh /backup.sh
 

README.md

@@ -38,4 +38,4 @@ docker run --rm --volumes-from=bitwarden registry.gitlab.com/1o/bitwarden_rs-bac
 | DB_FILE | Path to the Bitwarden sqlite3 database |
 | BACKUP_FILE | Path to the desired backup location |
 | CRON_TIME | Cronjob format "Minute Hour Day_of_month Month_of_year Day_of_week Year" |
-
+| TIMESTAMP | Set to `true` to append timestamp to the `BACKUP_FILE` |

backup.sh

@@ -1,9 +1,14 @@
 #!/bin/sh
 
+if [ $TIMESTAMP = true ]
+then
+  BACKUP_FILE="$(echo $BACKUP_FILE)_$(date "+%F-%H%M%S")"
+fi
+
 /usr/bin/sqlite3 $DB_FILE ".backup $BACKUP_FILE"
 if [ $? -eq 0 ] 
 then 
-  echo "$(date) - Backup successfull"
+  echo "$(date "+%F %T") - Backup successfull"
 else
-  echo "$(date) - Backup unsuccessfull"
+  echo "$(date "+%F %T") - Backup unsuccessfull"
 fi

start.sh

@@ -24,5 +24,5 @@ then
   /usr/sbin/crond -L /var/log/cron.log
 fi
 
-echo "$(date) - Container started" > "$LOGFILE"
+echo "$(date "+%F %T") - Container started" > "$LOGFILE"
 tail -F "$LOGFILE"