From 600f2fbd894d1e88329c66686bf1090d4e8f73ec Mon Sep 17 00:00:00 2001 From: Eddie Tang <75549795+talkblock@users.noreply.github.com> Date: Thu, 31 Dec 2020 18:12:38 -0800 Subject: [PATCH 1/5] Update backup.sh --- backup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backup.sh b/backup.sh index ca99da7..fc792e6 100644 --- a/backup.sh +++ b/backup.sh @@ -14,7 +14,7 @@ if [[ -z "$TARGET_FOLDER" ]]; then exit 1 fi - mongodump --uri "$MONGO_URI" --gzip --archive | aws s3 cp - "${TARGET_S3_FOLDER%/}/backup-$DATE.tar.gz" + mongodump --uri "$MONGO_URI" --gzip --archive | /usr/local/bin/aws s3 cp - "${TARGET_S3_FOLDER%/}/backup-$DATE.tar.gz" echo "Mongo dump uploaded to $TARGET_S3_FOLDER" else # save dump locally (and optionally to AWS S3) From 71db1a242b4be73039f504fdaea97af4a9f878b3 Mon Sep 17 00:00:00 2001 From: Felix Date: Thu, 25 Nov 2021 01:59:40 +0100 Subject: [PATCH 2/5] Update backup.sh add ability to set $DATE by env --- backup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backup.sh b/backup.sh index fc792e6..d322e01 100644 --- a/backup.sh +++ b/backup.sh @@ -4,7 +4,9 @@ set -eo pipefail echo "Job started: $(date)" -DATE=$(date +%Y%m%d_%H%M%S) +if [[ -z $DATE ]]; then + DATE=$(date +%Y%m%d_%H%M%S) +fi if [[ -z "$TARGET_FOLDER" ]]; then # dump directly to AWS S3 From b709df118af440f57577c93189e34e1ea246fdd4 Mon Sep 17 00:00:00 2001 From: Felix Date: Thu, 25 Nov 2021 02:04:55 +0100 Subject: [PATCH 3/5] Update Dockerfile-4.4 --- Dockerfile-4.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-4.4 b/Dockerfile-4.4 index ba1fe72..8a7b026 100644 --- a/Dockerfile-4.4 +++ b/Dockerfile-4.4 @@ -1,4 +1,4 @@ -FROM mongo:4.4.1 +FROM mongo:4.4.5 MAINTAINER Ilya Stepanov RUN apt-get update && \ From 27eeb360b3afa2b5a6712fc39c2e7a5d3fac830c Mon Sep 17 00:00:00 2001 From: Felix Date: Thu, 25 Nov 2021 02:14:08 +0100 Subject: [PATCH 4/5] Update README.md add Env-Vars --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3a7d45f..a952507 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ Docker image with `mongodump`, `cron` and AWS CLI to upload backups to AWS S3. | `TARGET_S3_FOLDER` | Folder to upload backups. Leave it empty to disable upload to S3. | `''` | | `AWS_ACCESS_KEY_ID` | AWS Access Key ID. Leave empty if you want to use AWS IAM Role instead. | `''` | | `AWS_SECRET_ACCESS_KEY` | AWS Access Key ID. Leave empty if you want to use AWS IAM Role instead. | `''` | +| `TZ` | Timezone | `''` | +| `DATE` | Override Date in generated Filename. Leave empty to use $(date +%Y%m%d_%H%M%S) | `''` | ### Examples From 4de20277a2ae70eb84ad742eb102d3656e1a6103 Mon Sep 17 00:00:00 2001 From: Felix Date: Thu, 21 Jul 2022 23:44:45 +0200 Subject: [PATCH 5/5] Update backup.sh fix the date var --- backup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backup.sh b/backup.sh index d322e01..36a483a 100644 --- a/backup.sh +++ b/backup.sh @@ -4,7 +4,7 @@ set -eo pipefail echo "Job started: $(date)" -if [[ -z $DATE ]]; then +if [[ -z "$DATE" ]]; then DATE=$(date +%Y%m%d_%H%M%S) fi