From 068577001e22880822956b82f6cbfa8c245f365f Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Wed, 26 Apr 2023 14:32:36 -0700
Subject: [PATCH] Release 3.9.0 - See CHANGELOG.md

---
 CHANGELOG.md                          |  6 ++++++
 README.md                             |  2 +-
 install/assets/functions/10-db-backup | 10 +++++-----
 install/usr/local/bin/restore         |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2e3217..4d2a4ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.9.0 2023-04-26 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add support for _FILE environment variables
+
+
 ## 3.8.5 2023-04-11 <tpansino@github>
 
    ### Changed
diff --git a/README.md b/README.md
index 775aad0..dfb4629 100644
--- a/README.md
+++ b/README.md
@@ -203,7 +203,7 @@ Your Organization will be mapped to `DB_USER` and your root token will need to b
 
 If `BACKUP_LOCATION` = `S3` then the following options are used.
 
-| Parameter             | Description                                                                               | Default | `_NAME` |
+| Parameter             | Description                                                                               | Default | `_FILE` |
 | --------------------- | ----------------------------------------------------------------------------------------- | ------- | ------- |
 | `S3_BUCKET`           | S3 Bucket name e.g. `mybucket`                                                            |         | x       |
 | `S3_KEY_ID`           | S3 Key ID (Optional)                                                                      |         | x       |
diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup
index 30447da..a1d3ba0 100644
--- a/install/assets/functions/10-db-backup
+++ b/install/assets/functions/10-db-backup
@@ -2,7 +2,7 @@
 
 bootstrap_variables() {
     sanity_var DB_TYPE "Set appropriate DB_TYPE"
-    transform_var \
+    transform_file_var \
                         DB_HOST \
                         DB_PORT \
                         DB_USER \
@@ -26,7 +26,7 @@ bootstrap_variables() {
         ;;
         mongo* )
             dbtype=mongo
-            transform_var MONGO_CUSTOM_URI
+            transform_file_var MONGO_CUSTOM_URI
             if [ -n "${MONGO_CUSTOM_URI}" ] ; then
                 mongo_uri_proto=$(echo "${MONGO_CUSTOM_URI}" | grep :// | sed -e's,^\(.*://\).*,\1,g')
                 mongo_uri_scratch="${MONGO_CUSTOM_URI/${mongo_uri_proto}/}"
@@ -44,7 +44,7 @@ bootstrap_variables() {
                 [[ ( -n "${DB_USER}" ) ]] && MONGO_USER_STR=" --username ${DB_USER}"
                 [[ ( -n "${DB_PASS}" ) ]] && MONGO_PASS_STR=" --password ${DB_PASS}"
                 [[ ( -n "${DB_NAME}" ) ]] && MONGO_DB_STR=" --db ${DB_NAME}"
-                transform_var DB_AUTH
+                transform_file_var DB_AUTH
                 [[ ( -n "${DB_AUTH}" ) ]] && MONGO_AUTH_STR=" --authenticationDatabase ${DB_AUTH}"
             fi
         ;;
@@ -103,7 +103,7 @@ bootstrap_variables() {
     esac
 
     if [ "${BACKUP_LOCATION,,}" = "s3" ] || [ "${BACKUP_LOCATION,,}" = "minio" ] ; then
-        transform_var \
+        transform_file_var \
                         S3_BUCKET \
                         S3_KEY_ID \
                         S3_KEY_SECRET \
@@ -116,7 +116,7 @@ bootstrap_variables() {
     fi
 
     if [ "${BACKUP_LOCATION,,}" = "blobxfer" ] ; then
-        transform_var \
+        transform_file_var \
                         BLOBXFER_STORAGE_ACCOUNT \
                         BLOBXFER_STORAGE_KEY
     fi
diff --git a/install/usr/local/bin/restore b/install/usr/local/bin/restore
index b1fe58d..e23dd2e 100755
--- a/install/usr/local/bin/restore
+++ b/install/usr/local/bin/restore
@@ -37,7 +37,7 @@ else
     case "$1" in
         "-h" )
             cat <<EOF
-${IMAGE_NAME} Restore Tool
+${IMAGE_NAME} Restore Tool ${IMAGE_VERSION}
 (c) 2022 Dave Conroy (https://github.com/tiredofit)
 
 This script will assist you in recovering databases taken by the Docker image.