From 1659e34fc78e16a253495aab464d6e55843de326 Mon Sep 17 00:00:00 2001 From: "dave@tiredofit.ca" Date: Thu, 2 Mar 2023 07:39:58 -0800 Subject: [PATCH] Release 3.7.5 - See CHANGELOG.md --- CHANGELOG.md | 6 ++++++ README.md | 2 +- install/assets/functions/10-db-backup | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc3679c..09a6460 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 3.7.5 2023-03-02 + + ### Added + - Add support for Docker Swarm mode Secrets for BLOBXFER_STORAGE_ACCOUNT_*_FILE + + ## 3.7.4 2023-02-22 ### Changed diff --git a/README.md b/README.md index ca6f338..b301d80 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ The following directories are used for configuration and can be mapped for persi #### Base Images used -This image relies on an [Alpine Linux](https://hub.docker.com/r/tiredofit/alpine) or [Debian Linux](https://hub.docker.com/r/tiredofit/debian) base image that relies on an [init system](https://github.com/just-containers/s6-overlay) for added capabilities. Outgoing SMTP capabilities are handlded via `msmtp`. Individual container performance monitoring is performed by [zabbix-agent](https://zabbix.org). Additional tools include: `bash`,`curl`,`less`,`logrotate`, `nano`,`vim`. +This image relies on an [Alpine Linux](https://hub.docker.com/r/tiredofit/alpine) or [Debian Linux](https://hub.docker.com/r/tiredofit/debian) base image that relies on an [init system](https://github.com/just-containers/s6-overlay) for added capabilities. Outgoing SMTP capabilities are handlded via `msmtp`. Individual container performance monitoring is performed by [zabbix-agent](https://zabbix.org). Additional tools include: `bash`,`curl`,`less`,`logrotate`, `nano`. Be sure to view the following repositories to understand all the customizable options: diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup index 4a0fa5f..b7b41dc 100644 --- a/install/assets/functions/10-db-backup +++ b/install/assets/functions/10-db-backup @@ -104,6 +104,11 @@ bootstrap_variables() { file_env 'S3_KEY_ID' file_env 'S3_KEY_SECRET' fi + + if [ "${BACKUP_LOCATION,,}" = "blobxfer" ] && [ -n "${BLOBXFER_STORAGE_ACCOUNT_FILE}" ] && [ -n "${BLOBXFER_STORAGE_ACCOUNT_KEY_FILE}" ]; then + file_env 'BLOBXFER_STORAGE_ACCOUNT_FILE' + file_env 'BLOBXFER_STORAGE_ACCOUNT_KEY_FILE' + fi } backup_couch() {