Release 3.9.0 - See CHANGELOG.md

This commit is contained in:
dave@tiredofit.ca
2023-04-26 14:32:36 -07:00
parent 7781542816
commit 068577001e
4 changed files with 13 additions and 7 deletions

View File

@@ -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> ## 3.8.5 2023-04-11 <tpansino@github>
### Changed ### Changed

View File

@@ -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. 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_BUCKET` | S3 Bucket name e.g. `mybucket` | | x |
| `S3_KEY_ID` | S3 Key ID (Optional) | | x | | `S3_KEY_ID` | S3 Key ID (Optional) | | x |

View File

@@ -2,7 +2,7 @@
bootstrap_variables() { bootstrap_variables() {
sanity_var DB_TYPE "Set appropriate DB_TYPE" sanity_var DB_TYPE "Set appropriate DB_TYPE"
transform_var \ transform_file_var \
DB_HOST \ DB_HOST \
DB_PORT \ DB_PORT \
DB_USER \ DB_USER \
@@ -26,7 +26,7 @@ bootstrap_variables() {
;; ;;
mongo* ) mongo* )
dbtype=mongo dbtype=mongo
transform_var MONGO_CUSTOM_URI transform_file_var MONGO_CUSTOM_URI
if [ -n "${MONGO_CUSTOM_URI}" ] ; then if [ -n "${MONGO_CUSTOM_URI}" ] ; then
mongo_uri_proto=$(echo "${MONGO_CUSTOM_URI}" | grep :// | sed -e's,^\(.*://\).*,\1,g') mongo_uri_proto=$(echo "${MONGO_CUSTOM_URI}" | grep :// | sed -e's,^\(.*://\).*,\1,g')
mongo_uri_scratch="${MONGO_CUSTOM_URI/${mongo_uri_proto}/}" 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_USER}" ) ]] && MONGO_USER_STR=" --username ${DB_USER}"
[[ ( -n "${DB_PASS}" ) ]] && MONGO_PASS_STR=" --password ${DB_PASS}" [[ ( -n "${DB_PASS}" ) ]] && MONGO_PASS_STR=" --password ${DB_PASS}"
[[ ( -n "${DB_NAME}" ) ]] && MONGO_DB_STR=" --db ${DB_NAME}" [[ ( -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}" [[ ( -n "${DB_AUTH}" ) ]] && MONGO_AUTH_STR=" --authenticationDatabase ${DB_AUTH}"
fi fi
;; ;;
@@ -103,7 +103,7 @@ bootstrap_variables() {
esac esac
if [ "${BACKUP_LOCATION,,}" = "s3" ] || [ "${BACKUP_LOCATION,,}" = "minio" ] ; then if [ "${BACKUP_LOCATION,,}" = "s3" ] || [ "${BACKUP_LOCATION,,}" = "minio" ] ; then
transform_var \ transform_file_var \
S3_BUCKET \ S3_BUCKET \
S3_KEY_ID \ S3_KEY_ID \
S3_KEY_SECRET \ S3_KEY_SECRET \
@@ -116,7 +116,7 @@ bootstrap_variables() {
fi fi
if [ "${BACKUP_LOCATION,,}" = "blobxfer" ] ; then if [ "${BACKUP_LOCATION,,}" = "blobxfer" ] ; then
transform_var \ transform_file_var \
BLOBXFER_STORAGE_ACCOUNT \ BLOBXFER_STORAGE_ACCOUNT \
BLOBXFER_STORAGE_KEY BLOBXFER_STORAGE_KEY
fi fi

View File

@@ -37,7 +37,7 @@ else
case "$1" in case "$1" in
"-h" ) "-h" )
cat <<EOF cat <<EOF
${IMAGE_NAME} Restore Tool ${IMAGE_NAME} Restore Tool ${IMAGE_VERSION}
(c) 2022 Dave Conroy (https://github.com/tiredofit) (c) 2022 Dave Conroy (https://github.com/tiredofit)
This script will assist you in recovering databases taken by the Docker image. This script will assist you in recovering databases taken by the Docker image.