Release 3.9.2 - See CHANGELOG.md

Release 3.9.1 - See CHANGELOG.md
Update README.md
2025-12-21 21:33:28 +01:00 · 2023-05-10 08:19:01 -07:00 · 2023-05-03 12:13:29 -07:00 · 2023-04-27 08:18:26 -07:00 · 2023-04-26 14:43:29 -07:00 · 2023-04-26 14:32:36 -07:00
19 changed files with 1670 additions and 831 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1 @@
+examples/
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Declare files that will always have LF line endings on checkout.
+*.* text eol=lf
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,112 +1,15 @@
-### Application Level Image CI
-### Dave Conroy <dave at tiredofit dot ca>
-
-name: 'build'
+name: "build_image"

 on:
  push:
    paths:
-    - '**'
-    - '!README.md'
+      - "**"
+      - "!README.md"
+
 jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Prepare
-        id: prep
-        run: |
-          DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/}
-          set -x
-          if [[ $GITHUB_REF == refs/heads/* ]]; then
-             if [[ $GITHUB_REF == refs/heads/*/* ]] ; then
-               BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
-             else
-               BRANCH=${GITHUB_REF#refs/heads/}
-             fi
-
-            case ${BRANCH} in
-              "main" | "master" )
-                  BRANCHTAG="${DOCKER_IMAGE}:latest"
-                ;;
-              "develop" )
-                  BRANCHTAG="${DOCKER_IMAGE}:develop"
-                ;;
-              * )
-                  if [ -n "${{ secrets.LATEST }}" ] ; then
-                    if [ "${BRANCHTAG}" = "${{ secrets.LATEST }}" ]; then
-                      BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest,${DOCKER_IMAGE}:latest"
-                    else
-                      BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest"
-                    fi
-                  else
-                    BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest"
-                  fi
-                ;;
-            esac
-          fi
-
-
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-               GITTAG="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed 's|refs/tags/||g')"
-          fi
-
-          if [ -n "${BRANCHTAG}" ] && [ -n "${GITTAG}" ]; then
-            TAGS=${BRANCHTAG},${GITTAG}
-          else
-            TAGS="${BRANCHTAG}${GITTAG}"
-          fi
-
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=docker_image::${DOCKER_IMAGE}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Label
-        id: Label
-        run: |
-          if [ -f "Dockerfile" ] ; then
-            sed -i "/FROM .*/a LABEL tiredofit.image.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" Dockerfile
-            sed -i "/FROM .*/a LABEL tiredofit.image.git_commit=\"${GITHUB_SHA}\"" Dockerfile
-            sed -i "/FROM .*/a LABEL tiredofit.image.git_committed_by=\"${GITHUB_ACTOR}\"" Dockerfile
-            sed -i "/FROM .*/a LABEL tiredofit.image.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile
-            if [ -f "CHANGELOG.md" ] ; then
-              sed -i "/FROM .*/a LABEL tiredofit.db-backup.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile
-              mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md
-            fi
-
-
-            if [[ $GITHUB_REF == refs/tags/* ]]; then
-              sed -i "/FROM .*/a LABEL tiredofit.image.git_tag=\"${GITHUB_REF#refs/tags/v}\"" Dockerfile
-            fi
-
-            if [[ $GITHUB_REF == refs/heads/* ]]; then
-              sed -i "/FROM .*/a LABEL tiredofit.image.git_branch=\"${GITHUB_REF#refs/heads/}\"" Dockerfile
-            fi
-          fi
-
-      - name: Build
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          push: true
-          tags: ${{ steps.prep.outputs.tags }}
+  build:
+    uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
+    #uses: tiredofit/github_actions/.github/workflows/default_amd64.yml@main
+    #uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
+    #uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
+    secrets: inherit
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -1,6 +1,4 @@
-# Manual Workflow (Application)
-
-name: manual
+name: "manual_build_image"

 on:
  workflow_dispatch:
@@ -8,105 +6,11 @@ on:
      Manual Build:
        description: 'Manual Build'
        required: false
+
 jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Prepare
-        id: prep
-        run: |
-          DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/}
-          set -x
-          if [[ $GITHUB_REF == refs/heads/* ]]; then
-             if [[ $GITHUB_REF == refs/heads/*/* ]] ; then
-               BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
-             else
-               BRANCH=${GITHUB_REF#refs/heads/}
-             fi
-
-            case ${BRANCH} in
-              "main" | "master" )
-                  BRANCHTAG="${DOCKER_IMAGE}:latest"
-                ;;
-              "develop" )
-                  BRANCHTAG="${DOCKER_IMAGE}:develop"
-                ;;
-              * )
-                  if [ -n "${{ secrets.LATEST }}" ] ; then
-                    if [ "${BRANCHTAG}" = "${{ secrets.LATEST }}" ]; then
-                      BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest,${DOCKER_IMAGE}:latest"
-                    else
-                      BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest"
-                    fi
-                  else
-                    BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest"
-                  fi
-                ;;
-            esac
-          fi
-
-
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-               GITTAG="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed 's|refs/tags/||g')"
-          fi
-
-          if [ -n "${BRANCHTAG}" ] && [ -n "${GITTAG}" ]; then
-            TAGS=${BRANCHTAG},${GITTAG}
-          else
-            TAGS="${BRANCHTAG}${GITTAG}"
-          fi
-
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=docker_image::${DOCKER_IMAGE}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Label
-        id: Label
-        run: |
-          if [ -f "Dockerfile" ] ; then
-            sed -i "/FROM .*/a LABEL tiredofit.image.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" Dockerfile
-            sed -i "/FROM .*/a LABEL tiredofit.image.git_commit=\"${GITHUB_SHA}\"" Dockerfile
-            sed -i "/FROM .*/a LABEL tiredofit.image.git_committed_by=\"${GITHUB_ACTOR}\"" Dockerfile
-            sed -i "/FROM .*/a LABEL tiredofit.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile
-            if [ -f "CHANGELOG.md" ] ; then
-              sed -i "/FROM .*/a LABEL tiredofit.db-backup.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile
-              mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md
-            fi
-
-
-            if [[ $GITHUB_REF == refs/tags/* ]]; then
-              sed -i "/FROM .*/a LABEL tiredofit.image.git_tag=\"${GITHUB_REF#refs/tags/v}\"" Dockerfile
-            fi
-
-            if [[ $GITHUB_REF == refs/heads/* ]]; then
-              sed -i "/FROM .*/a LABEL tiredofit.image.git_branch=\"${GITHUB_REF#refs/heads/}\"" Dockerfile
-            fi
-          fi
-
-      - name: Build
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          push: true
-          tags: ${{ steps.prep.outputs.tags }}
+  build:
+    uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
+    #uses: tiredofit/github_actions/.github/workflows/default_amd64.yml@main
+    #uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
+    #uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
+    secrets: inherit
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,406 @@
+## 3.9.2 2023-05-10 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Alpine 3.18 base
+
+
+## 3.9.1 2023-05-03 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Properly allow multiple _FILE environment variables to execute solving an issue with MySQL backups
+      - Fix _FILE functionality for DB_NAME variable
+
+
+## 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
+      - Fix SQLite3, Influx, and MSSQL backups failing due to malformed/non existent ltarget
+
+
+## 3.8.4 2023-04-06 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix issue with Influx2 and MSSQL clients not installing properly
+
+
+## 3.8.3 2023-03-30 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Patchup for 3.8.2
+
+
+## 3.8.2 2023-03-30 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Patchup for 3.8.1
+
+
+## 3.8.1 2023-03-30 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Cleanup Dockerfile
+      - Fix issue with DB_ARCHIVE_TIME not firing correctly
+
+
+## 3.8.0 2023-03-27 <dave at tiredofit dot ca>
+
+   ### Added
+      - Introduce DB_DUMP_TARGET_ARCHIVE which works with DB_ARCHIVE_TIME to move backups older than (x) minutes from DB_DUMP_TARGET to DB_DUMP_TARGET_ARCHIVE for use with external backup systems and custom exclude rules
+      - Introduce CREATE_LATEST_SYMLINK which creates a symbolic link in DB_DUMP_TARGET of `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)`
+
+
+## 3.7.7 2023-03-20 <codemonium@github>
+
+   ### Changed
+      - Simplify pg_isready usage
+
+
+## 3.7.6 2023-03-14 <toshy@github>
+
+   ### Changed
+      - Remove EXTRA_OPT variable from MySQL/MariaDB check
+
+
+## 3.7.5 2023-03-02 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add support for Docker Swarm mode Secrets for BLOBXFER_STORAGE_ACCOUNT_*_FILE
+
+
+## 3.7.4 2023-02-22 <gbe0@github>
+
+   ### Changed
+      - Fix when running in MANUAL_RUN_FOREVER mode looping
+
+
+## 3.7.3 2022-12-20 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Make S3_KEY_ID and S3_KEY_SECRET optional should IAM roles be used (Credit to alwynpan@github)
+
+
+## 3.7.2 2022-12-19 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Bugfix for 3.7.1
+
+
+## 3.7.1 2022-12-19 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Add MYSQL_ENABLE_TLS environment variable to switch on and off
+
+   ### Reverted
+      - Set default for MYSQL_TLS_CA_FILE to accomodate for most use cases
+
+
+## 3.7.0 2022-12-16 <dave at tiredofit dot ca>
+
+   ### Added
+      - Introduce support for connecting via TLS to MySQL / MariaDB Hosts with MYSQL_TLS_* variables - See README for more details
+
+   ### Changed
+      - Fix for cleaning up filesystems that are syncing to Azure via blobxfer
+
+
+## 3.6.1 2022-11-23 <dave at tiredofit dot ca>
+
+   ### Added
+      - Switch to Alpine 3.17 base
+      - Switch to OpenSSL instead of LibreSSL
+
+
+## 3.6.0 2022-11-21 <dave at tiredofit dot ca>
+
+   ### Added
+      - Postgresql 15 Support
+
+
+## 3.5.6 2022-11-15 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Add failure if DB_TYPE empty or malformed
+
+
+## 3.5.5 2022-10-18 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for S3 backups and trailing slashes (@greena13)
+
+
+## 3.5.4 2022-10-13 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for Influx DB 1 backups when compression enabled
+
+
+## 3.5.3 2022-10-12 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Remove build dependencies for blobxfer making image size smaller
+      - Remove silencing commands limiting Postgres backups from working without DEBUG_MODE=TRUE
+
+
+## 3.5.2 2022-10-11 <dave at tiredofit dot ca>
+
+   ### Added
+      - Update Influxdb client to 2.4.0 (jauderho@github)
+
+
+## 3.5.1 2022-10-11 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Tighten up cleanup routines to not call blobxfer unless absolutely necessary
+
+
+## 3.5.0 2022-10-10 <dave at tiredofit dot ca>
+
+   ### Added
+      - Blobxfer / Microsoft Azure Support (credit: eoehen@github)
+      - Introduce MONGO_CUSTOM_URI environment variable for those not wanting to use DB_* variables
+
+   ### Changed
+      - Force filenames to be in lowercase
+      - Fix S3 Database cleanups (credit greenatwork@github)
+      - Remove MONGO_DB_TYPE variable as MONGO_CUSTOM_URI overrides
+      - Fix MSSQL Backups (credit eoehen@github)
+      - Seperate examples for MySQL and MSSQL
+
+
+## 3.4.2 2022-09-19 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Skip availability check for Mongo Atlas connections
+
+
+## 3.4.1 2022-09-13 <dave at tiredofit dot ca>
+
+### Added
+- Introduce environment variables for SCRIPT_LOCATION_POST and SCRIPT_LOCATION_PRE for better seperation
+   
+### Deprecated
+
+- Introduce deprecation warning for the custom script paths `/assets/custom-scripts` and `/assets/custom-scripts/pre`. These
+paths will continue to work for now but support may be removed in the next major version release. To support the new
+default paths your scripts should be moved as follows:
+
+  |Script Type|Old Path (Deprecated)|New Environment Variable|Environment Value Default|
+  |-----------|--------|-------------------------|----------------|
+  |Pre|`/assets/custom-scripts/pre`|SCRIPT_LOCATION_PRE|`/assets/scripts/pre`|
+  |Post|`/assets/custom-scripts`|SCRIPT_LOCATION_POST|`/assets/scripts/post`|
+
+
+## 3.4.0 2022-09-12 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add GZ_RSYNCABLE environment variable for better rsync compatibility (Credit teun95@github)
+      - Add Pre Backup Script Support
+      - Add MongoDB Atlas Support
+
+   ### Changed
+      - Fix Default Port for Influx 2 DB Hosts
+
+
+## 3.3.12 2022-08-15 <dave at tiredofit dot ca>
+
+   ### Changed
+      - arifer612@github contributed a fix for incorrect case of "filesize" variable when using post backup scripts
+
+
+## 3.3.11 2022-07-22 <khoazero123@github>
+
+   ### Fixed
+      - Restore script not properly detecting postgres backups
+
+
+## 3.3.10 2022-07-19 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Remove MSSQL install packages properly
+
+
+## 3.3.9 2022-07-09 <fardeau@github>
+
+   ### Fixed
+      - Remaining work on interactive mode for entering port on restore script
+
+
+## 3.3.8 2022-07-09 <dave at tiredofit dot ca>
+
+   ### Added
+      - MSSQL Client Tools 18.0.1.1-1
+
+
+## 3.3.7 2022-06-23 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Allow overrides to actually override with the restore script
+
+
+## 3.3.6 2022-06-23 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for restore script when using all 7 arguments
+
+
+## 3.3.5 2022-06-08 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix DB Port parameter not being able to be input in restore script
+      - Fix MongoDB restore questionnaire
+
+
+## 3.3.4 2022-06-03 <rozdzynski@github>
+
+   ### Fixed
+      - S3 backups failing with special characters in filename
+
+
+## 3.3.3 2022-05-24 <dave at tiredofit dot ca>
+
+   ### Added
+      - Alpine 3.16 base
+
+
+## 3.3.2 2022-05-02 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add POST_SCRIPT_SKIP_X_VERIFY environment variables to allow for more host compatibility for post scripts
+
+
+## 3.3.1 2022-04-30 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Compressing silently was causing 0 byte backups
+
+
+## 3.3.0 2022-04-30 <dave at tiredofit dot ca>
+
+   ### Added
+      - Ability to auto clean old S3 / Minio Hosts like what occurs on filesysten
+      - Alert user how to turn off Zabbix Monitoring if fails
+      - Allow Zabbix Monitoring to work with S3
+      - Silence some more compression statements
+   ### Changed
+      - Fix for Redis not backing up properly
+      - Start sending checksums for S3 Outputs
+      - Cleanup some code functions
+      - FIx Container Log Level always in DEBUG
+
+
+## 3.2.4 2022-04-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Add -portable flag when backing up Influx
+
+
+## 3.2.3 2022-04-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for bucket / db name InfluxDB 1.xx
+      - Minor aesthetics, spacing, spelling
+
+
+## 3.2.2 2022-04-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Restore script properly parses DB_PORT entry
+      - Influx Database ready performs different checks dependent on V1/V2
+      - Stop using weird database lowercase variables unneccessarily breaking Docker Secrets
+
+
+## 3.2.1 2022-04-03 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix a variety of issues iwth 3.2.0 relating to InfluxDB
+
+
+## 3.2.0 2022-03-31 <dave at tiredofit dot ca>
+
+   ### Added
+      - Install InfluxDB2 Client alongside version 1 (amd64 and arm64)
+      - Introduce InfluxDB 2 backup support
+      - Introduce multiple compression types other than Gzip for Influx 1/2
+      - Introduce compression for MSSQL backups
+
+   ### Changed
+      - Testing for Host availability for CouchDB and InfluxDB
+
+
+## 3.1.3 2022-03-30 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for MariaDB not sending database name to post script
+      - Check for executible bit on post scripts both via environment variable and /assets/custom
+      - SPLIT_DB defaulted to TRUE
+
+
+## 3.1.2 2022-03-29 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for blank Notice when individual backup is completed (time taken)
+
+
+## 3.1.1 2022-03-28 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Resolve some issues with backups of Mongo and others not saving the proper timestamp
+
+
+## 3.1.0 2022-03-23 <dave at tiredofit dot ca>
+
+   ### Added
+      - Backup multiple databases by seperating with comma e.g. db1,db2
+      - Backup ALL databases bu setting DB_NAME to ALL
+      - Exclude databases from being backed up comma seperated when DB_NAME is all eg DB_NAME_EXCLUDE=db3,db4
+      - Backup timers execute per database, not per the whole script run
+      - Post scripts run after each database backup
+      - Checksum does not occur when database backup failed
+      - Database cleanup does not occur when any databases backups fail throughout session
+      - MongoDB now supported with 'restore' script - Credit to piemonkey@github
+      - Lots of reshuffling, optimizations with script due to botched 3.0 release
+
+   ### Changed
+      - ZSTD replaces GZ as default compression type
+      - Output is cleaner when backups are occurring
+
+## 3.0.16 2022-03-23 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for SPLIT_DB not looping through all databse names properly
+
+
+## 3.0.15 2022-03-22 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Rework compression function
+      - Fix for Bzip compression failing
+
+
+## 3.0.14 2022-03-22 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Rearrange Notice stating when next backup is going to start
+
+
+## 3.0.13 2022-03-21 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add compression levels to debug mode
+
+
+## 3.0.12 2022-03-21 <dave at tiredofit dot ca>
+
+   ### Added
+      - Throw Errors for MANUAL mode when certain other CONTAINER_* services are enabled
+
+
 ## 3.0.11 2022-03-21 <dave at tiredofit dot ca>

   ### Changed
@@ -191,7 +594,7 @@


 ## 2.9.2 2021-10-22 <teenigma@github>
-   
+
   ### Fixed
      - Fix compression failing on Redis backup

--- a/60
+++ b/60
@@ -1,8 +1,12 @@
-FROM docker.io/tiredofit/alpine:3.15
+ARG DISTRO=alpine
+ARG DISTRO_VARIANT=3.18
+
+FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"

 ### Set Environment Variables
-ENV MSSQL_VERSION=17.8.1.1-1 \
+ENV INFLUX2_VERSION=2.4.0 \
+    MSSQL_VERSION=18.0.1.1-1 \
    CONTAINER_ENABLE_MESSAGING=FALSE \
    CONTAINER_ENABLE_MONITORING=TRUE \
    CONTAINER_PROCESS_RUNAWAY_PROTECTOR=FALSE \
@@ -10,18 +14,23 @@ ENV MSSQL_VERSION=17.8.1.1-1 \
    IMAGE_REPO_URL="https://github.com/tiredofit/docker-db-backup/"

 ### Dependencies
-RUN set -ex && \
-    apk update && \
-    apk upgrade && \
-    apk add -t .db-backup-build-deps \
+RUN source /assets/functions/00-container && \
+    set -ex && \
+    package update && \
+    package upgrade && \
+    package install .db-backup-build-deps \
               build-base \
               bzip2-dev \
               git \
               libarchive-dev \
+               openssl-dev \
+               libffi-dev \
+               python3-dev \
+               py3-pip \
               xz-dev \
               && \
    \
-    apk add --no-cache -t .db-backup-run-deps \
+    package install .db-backup-run-deps \
               aws-cli \
               bzip2 \
               influxdb \
@@ -29,24 +38,28 @@ RUN set -ex && \
               mariadb-client \
               mariadb-connector-c \
               mongodb-tools \
-               libressl \
+               openssl \
               pigz \
-               postgresql \
-               postgresql-client \
+               postgresql15 \
+               postgresql15-client \
               pv \
+               py3-cryptography \
               redis \
               sqlite \
               xz \
               zstd \
               && \
    \
-    cd /usr/src && \
-    \
    apkArch="$(apk --print-arch)"; \
    case "$apkArch" in \
-	x86_64) mssql=true ; curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MSSQL_VERSION}_amd64.apk ; curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/mssql-tools_${MSSQL_VERSION}_amd64.apk ; echo y | apk add --allow-untrusted msodbcsql17_${MSSQL_VERSION}_amd64.apk mssql-tools_${MSSQL_VERSION}_amd64.apk ;; \
-	*) echo >&2 "Detected non x86_64 build variant, skipping MSSQL installation" ;; \
+	x86_64) mssql=true ; influx2=true ; influx_arch=amd64; ;; \
+    aarch64 ) influx2=true ; influx_arch=arm64 ;; \
+    *) sleep 0.1 ;; \
    esac; \
+    \
+    if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/msodbcsql18_${MSSQL_VERSION}_amd64.apk ; curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/mssql-tools18_${MSSQL_VERSION}_amd64.apk ; echo y | apk add --allow-untrusted msodbcsql18_${MSSQL_VERSION}_amd64.apk mssql-tools18_${MSSQL_VERSION}_amd64.apk ; else echo >&2 "Detected non x86_64 build variant, skipping MSSQL installation" ; fi; \
+    if [ $influx2 = "true" ] ; then curl -sSL https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX2_VERSION}-linux-${influx_arch}.tar.gz | tar xvfz - --strip=1 -C /usr/src/ ; chmod +x /usr/src/influx ; mv /usr/src/influx /usr/sbin/ ; else echo >&2 "Unable to build Influx 2 on this system" ; fi ; \
+    \
    mkdir -p /usr/src/pbzip2 && \
    curl -sSL https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz | tar xvfz - --strip=1 -C /usr/src/pbzip2 && \
    cd /usr/src/pbzip2 && \
@@ -63,11 +76,16 @@ RUN set -ex && \
    make && \
    make install && \
    \
-### Cleanup
-    apk del .db-backup-build-deps && \
-    rm -rf /usr/src/* && \
-    rm -rf /etc/logrotate.d/redis && \
-    rm -rf /root/.cache /tmp/* /var/cache/apk/*
+    pip3 install blobxfer && \
+    \
+    package remove .db-backup-build-deps && \
+    package cleanup && \
+    rm -rf \
+            /*.apk \
+            /etc/logrotate.d/* \
+            /root/.cache \
+            /tmp/* \
+            /usr/src/*

-### S6 Setup
-ADD install  /
+
+COPY install  /
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # github.com/tiredofit/docker-db-backup

 [![GitHub release](https://img.shields.io/github/v/tag/tiredofit/docker-db-backup?style=flat-square)](https://github.com/tiredofit/docker-db-backup/releases/latest)
-[![Build Status](https://img.shields.io/github/workflow/status/tiredofit/docker-db-backup/build?style=flat-square)](https://github.com/tiredofit/docker-db-backup/actions?query=workflow%3Abuild)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/tiredofit/docker-db-backup/main.yml?branch=main&style=flat-square)](https://github.com/tiredofit/docker-db-backup/actions)
 [![Docker Stars](https://img.shields.io/docker/stars/tiredofit/db-backup.svg?style=flat-square&logo=docker)](https://hub.docker.com/r/tiredofit/db-backup/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/tiredofit/db-backup.svg?style=flat-square&logo=docker)](https://hub.docker.com/r/tiredofit/db-backup/)
 [![Become a sponsor](https://img.shields.io/badge/sponsor-tiredofit-181717.svg?logo=github&style=flat-square)](https://github.com/sponsors/tiredofit)
@@ -14,9 +14,10 @@ This will build a container for backing up multiple types of DB Servers

 Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers.

-* dump to local filesystem or backup to S3 Compatible services
+* dump to local filesystem or backup to S3 Compatible services, and Azure.
 * select database user and password
-* backup all databases
+* backup all databases, single, or multiple databases
+* backup all to seperate files or one singular file
 * choose to have an MD5 or SHA1 sum after backup for verification
 * delete old backups after specific amount of time
 * choose compression type (none, gz, bz, xz, zstd)
@@ -36,7 +37,6 @@ Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers.
 - [About](#about)
 - [Maintainer](#maintainer)
 - [Table of Contents](#table-of-contents)
-  - [Persistent Storage](#persistent-storage)
 - [Prerequisites and Assumptions](#prerequisites-and-assumptions)
 - [Installation](#installation)
  - [Build from Source](#build-from-source)
@@ -44,19 +44,24 @@ Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers.
    - [Multi Architecture](#multi-architecture)
 - [Configuration](#configuration)
  - [Quick Start](#quick-start)
-  - [Persistent Storage](#persistent-storage-1)
+  - [Persistent Storage](#persistent-storage)
  - [Environment Variables](#environment-variables)
    - [Base Images used](#base-images-used)
    - [Container Options](#container-options)
  - [Database Specific Options](#database-specific-options)
+    - [For Influx DB2:](#for-influx-db2)
  - [Scheduling Options](#scheduling-options)
  - [Backup Options](#backup-options)
    - [Backing Up to S3 Compatible Services](#backing-up-to-s3-compatible-services)
+    - [Upload to a Azure storage account by `blobxfer`](#upload-to-a-azure-storage-account-by-blobxfer)
 - [Maintenance](#maintenance)
  - [Shell Access](#shell-access)
  - [Manual Backups](#manual-backups)
  - [Restoring Databases](#restoring-databases)
  - [Custom Scripts](#custom-scripts)
+    - [Path Options](#path-options)
+    - [Pre Backup](#pre-backup)
+    - [Post backup](#post-backup)
 - [Support](#support)
  - [Usage](#usage)
  - [Bugfixes](#bugfixes)
@@ -65,7 +70,6 @@ Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers.
 - [License](#license)

 > **NOTE**: If you are using this with a docker-compose file along with a seperate SQL container, take care not to set the variables to backup immediately, more so have it delay execution for a minute, otherwise you will get a failed first backup.
-### Persistent Storage

 ## Prerequisites and Assumptions
 *  You must have a working connection to one of the supported DB Servers and appropriate credentials
@@ -76,7 +80,13 @@ Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers.
 Clone this repository and build the image with `docker build <arguments> (imagename) .`

 ### Prebuilt Images
-Builds of the image are available on [Docker Hub](https://hub.docker.com/r/tiredofit/db-backup) and is the recommended method of installation.
+Builds of the image are available on [Docker Hub](https://hub.docker.com/r/tiredofit/db-backup)
+
+Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-db-backup/pkgs/container/docker-db-backup)
+
+```
+docker pull ghcr.io/tiredofit/docker-db-backup:(imagetag)
+```

 The following image tags are available along with their tagged release based on what's written in the [Changelog](CHANGELOG.md):

@@ -85,7 +95,7 @@ The following image tags are available along with their tagged release based on
 | latest      | `:latest` |

 ```bash
-docker pull tiredofit/db-backup:(imagetag)
+docker pull docker.io/tiredofdit/db-backup:(imagetag)
 ```
 #### Multi Architecture
 Images are built primarily for `amd64` architecture, and may also include builds for `arm/v7`, `arm64` and others. These variants are all unsupported. Consider [sponsoring](https://github.com/sponsors/tiredofit) my work so that I can work with various hardware. To see if this image supports multiple architecures, type `docker manifest (image):(tag)`
@@ -99,19 +109,21 @@ Images are built primarily for `amd64` architecture, and may also include builds
 * Set various [environment variables](#environment-variables) to understand the capabilities of this image.
 * Map [persistent storage](#data-volumes) for access to configuration and data files for backup.
 * Make [networking ports](#networking) available for public access if necessary
+
 ### Persistent Storage

 The following directories are used for configuration and can be mapped for persistent storage.
-| Directory                | Description                                                                        |
-| ------------------------ | ---------------------------------------------------------------------------------- |
-| `/backup`                | Backups                                                                            |
-| `/assets/custom-scripts` | *Optional* Put custom scripts in this directory to execute after backup operations |
+| Directory              | Description                                                                         |
+| ---------------------- | ----------------------------------------------------------------------------------- |
+| `/backup`              | Backups                                                                             |
+| `/assets/scripts/pre`  | *Optional* Put custom scripts in this directory to execute before backup operations |
+| `/assets/scripts/post` | *Optional* Put custom scripts in this directory to execute after backup operations  |

 ### Environment Variables

 #### 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) 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:

@@ -121,49 +133,70 @@ Be sure to view the following repositories to understand all the customizable op

 #### Container Options

-| Parameter            | Description                                                                                                                      | Default         |
-| -------------------- | -------------------------------------------------------------------------------------------------------------------------------- | --------------- |
-| `BACKUP_LOCATION`    | Backup to `FILESYSTEM` or `S3` compatible services like S3, Minio, Wasabi                                                        | `FILESYSTEM`    |
-| `MODE`               | `AUTO` mode to use internal scheduling routines or `MANUAL` to simply use this as manual backups only executed by your own means | `AUTO`          |
-| `MANUAL_RUN_FOREVER` | `TRUE` or `FALSE` if you wish to try to make the container exit after the backup                                                 | `TRUE`          |
-| `TEMP_LOCATION`      | Perform Backups and Compression in this temporary directory                                                                      | `/tmp/backups/` |
-| `DB_AUTH`            | (Mongo Only - Optional) Authentication Database                                                                                  |                 |
-| `DEBUG_MODE`         | If set to `true`, print copious shell script messages to the container log. Otherwise only basic messages are printed.           | `FALSE`         |
-| `POST_SCRIPT`        | Fill this variable in with a command to execute post the script backing up                                                       |                 |
-| `SPLIT_DB`           | If using root as username and multiple DBs on system, set to TRUE to create Seperate DB Backups instead of all in one.           | `FALSE`         |
+| Parameter               | Description                                                                                                                      | Default         |
+| ----------------------- | -------------------------------------------------------------------------------------------------------------------------------- | --------------- |
+| `BACKUP_LOCATION`       | Backup to `FILESYSTEM` or `S3` compatible services like S3, Minio, Wasabi                                                        | `FILESYSTEM`    |
+| `MODE`                  | `AUTO` mode to use internal scheduling routines or `MANUAL` to simply use this as manual backups only executed by your own means | `AUTO`          |
+| `MANUAL_RUN_FOREVER`    | `TRUE` or `FALSE` if you wish to try to make the container exit after the backup                                                 | `TRUE`          |
+| `TEMP_LOCATION`         | Perform Backups and Compression in this temporary directory                                                                      | `/tmp/backups/` |
+| `DEBUG_MODE`            | If set to `true`, print copious shell script messages to the container log. Otherwise only basic messages are printed.           | `FALSE`         |
+| `CREATE_LATEST_SYMLINK` | Create a symbolic link pointing to last backup in this format: `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)`                            | `TRUE`          |
+| `PRE_SCRIPT`            | Fill this variable in with a command to execute pre backing up                                                                   |                 |
+| `POST_SCRIPT`           | Fill this variable in with a command to execute post backing up                                                                  |                 |
+| `SPLIT_DB`              | For each backup, create a new archive. `TRUE` or `FALSE` (MySQL and Postgresql Only)                                             | `TRUE`          |

 ### Database Specific Options
-| Parameter | Description                                                                                   | Default |
-| --------- | --------------------------------------------------------------------------------------------- | ------- |
-| `DB_TYPE` | Type of DB Server to backup `couch` `influx` `mysql` `pgsql` `mongo` `redis` `sqlite3`        |         |
-| `DB_HOST` | Server Hostname e.g. `mariadb`. For `sqlite3`, full path to DB file e.g. `/backup/db.sqlite3` |         |
-| `DB_NAME` | Schema Name e.g. `database`                                                                   |         |
-| `DB_USER` | username for the database - use `root` to backup all MySQL of them.                           |         |
-| `DB_PASS` | (optional if DB doesn't require it) password for the database                                 |         |
-| `DB_PORT` | (optional) Set port to connect to DB_HOST. Defaults are provided                              | varies  |
+| Parameter          | Description                                                                                                                                                                          | Default | `_FILE` |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- | ------- |
+| `DB_AUTH`          | (Mongo Only - Optional) Authentication Database                                                                                                                                      |         |         |
+| `DB_TYPE`          | Type of DB Server to backup `couch` `influx` `mysql` `pgsql` `mongo` `redis` `sqlite3`                                                                                               |         |         |
+| `DB_HOST`          | Server Hostname e.g. `mariadb`. For `sqlite3`, full path to DB file e.g. `/backup/db.sqlite3`                                                                                        |         | x       |
+| `DB_NAME`          | Schema Name e.g. `database` or `ALL` to backup all databases the user has access to. Backup multiple by seperating with commas eg `db1,db2`                                          |         | x       |
+| `DB_NAME_EXCLUDE`  | If using `ALL` - use this as to exclude databases seperated via commas from being backed up                                                                                          |         | x       |
+| `DB_USER`          | username for the database(s) - Can use `root` for MySQL                                                                                                                              |         | x       |
+| `DB_PASS`          | (optional if DB doesn't require it) password for the database                                                                                                                        |         | x       |
+| `DB_PORT`          | (optional) Set port to connect to DB_HOST. Defaults are provided                                                                                                                     | varies  | x       |
+| `INFLUX_VERSION`   | What Version of Influx are you backing up from `1`.x or `2` series - AMD64 and ARM64 only for `2`                                                                                    |         |         |
+| `MONGO_CUSTOM_URI` | If you wish to override the MongoDB Connection string enter it here e.g. `mongodb+srv://username:password@cluster.id.mongodb.net`                                                    |         | x       |
+|                    | This environment variable will be parsed and populate the `DB_NAME` and `DB_HOST` variables to properly build your backup filenames. You can overrde them by making your own entries |         |         |
+
+#### For Influx DB2:
+Your Organization will be mapped to `DB_USER` and your root token will need to be mapped to `DB_PASS`. You may use `DB_NAME=ALL` to backup the entire set of databases. For `DB_HOST` use syntax of `http(s)://db-name`
+
 ### Scheduling Options
-| Parameter         | Description                                                                                                                                                                                        | Default |
-| ----------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| `DB_DUMP_FREQ`    | How often to do a dump, in minutes. Defaults to 1440 minutes, or once per day.                                                                                                                     | `1440`  |
-| `DB_DUMP_BEGIN`   | What time to do the first dump. Defaults to immediate. Must be in one of two formats                                                                                                               |         |
-|                   | Absolute HHMM, e.g. `2330` or `0415`                                                                                                                                                               |         |
-|                   | Relative +MM, i.e. how many minutes after starting the container, e.g. `+0` (immediate), `+10` (in 10 minutes), or `+90` in an hour and a half                                                     |         |
-| `DB_CLEANUP_TIME` | Value in minutes to delete old backups (only fired when dump freqency fires). 1440 would delete anything above 1 day old. You don't need to set this variable if you want to hold onto everything. | `FALSE` |
+| Parameter                | Description                                                                                                                                                                                        | Default                      |
+| ------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------- |
+| `DB_DUMP_FREQ`           | How often to do a dump, in minutes after the first backup. Defaults to 1440 minutes, or once per day.                                                                                              | `1440`                       |
+| `DB_DUMP_BEGIN`          | What time to do the first dump. Defaults to immediate. Must be in one of two formats                                                                                                               |                              |
+|                          | Absolute HHMM, e.g. `2330` or `0415`                                                                                                                                                               |                              |
+|                          | Relative +MM, i.e. how many minutes after starting the container, e.g. `+0` (immediate), `+10` (in 10 minutes), or `+90` in an hour and a half                                                     |                              |
+| `DB_DUMP_TARGET`         | Directory where the database dumps are kept.                                                                                                                                                       | `${DB_DUMP_TARGET}/archive/` |
+| `DB_DUMP_TARGET_ARCHIVE` | Optional Directory where the database dumps archives are kept.                                                                                                                                     |                              |
+| `DB_CLEANUP_TIME`        | Value in minutes to delete old backups (only fired when dump freqency fires). 1440 would delete anything above 1 day old. You don't need to set this variable if you want to hold onto everything. | `FALSE`                      |
+| `DB_ARCHIVE_TIME`        | Value in minutes to move all files files older than (x) from `DB_DUMP_TARGET` to `DB_DUMP_TARGET_ARCHIVE` - which is useful when pairing against an external backup system.                        |                              |

 - You may need to wrap your `DB_DUMP_BEGIN` value in quotes for it to properly parse. There have been reports of backups that start with a `0` get converted into a different format which will not allow the timer to start at the correct time.
+
 ### Backup Options
-| Parameter                      | Description                                                                                                                  | Default        |
-| ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------- | -------------- |
-| `COMPRESSION`                  | Use either Gzip `GZ`, Bzip2 `BZ`, XZip `XZ`, ZSTD `ZSTD` or none `NONE`                                                      | `GZ`           |
-| `COMPRESSION_LEVEL`            | Numberical value of what level of compression to use, most allow `1` to `9` except for `ZSTD` which allows for `1` to `19` - | `3`            |
-| `ENABLE_PARALLEL_COMPRESSION`  | Use multiple cores when compressing backups `TRUE` or `FALSE`                                                                | `TRUE`         |
-| `PARALLEL_COMPRESSION_THREADS` | Maximum amount of threads to use when compressing - Integer value e.g. `8`                                                   | `autodetected` |
-| `ENABLE_CHECKSUM`              | Generate either a MD5 or SHA1 in Directory, `TRUE` or `FALSE`                                                                | `TRUE`         |
-| `CHECKSUM`                     | Either `MD5` or `SHA1`                                                                                                       | `MD5`          |
-| `EXTRA_OPTS`                   | If you need to pass extra arguments to the backup command, add them here e.g. `--extra-command`                              |                |
-| `MYSQL_MAX_ALLOWED_PACKET`     | Max allowed packet if backing up MySQL / MariaDB                                                                             | `512M`         |
-| `MYSQL_SINGLE_TRANSACTION`     | Backup in a single transaction with MySQL / MariaDB                                                                          | `TRUE`         |
-| `MYSQL_STORED_PROCEDURES`      | Backup stored procedures with MySQL / MariaDB                                                                                | `TRUE`         |
+| Parameter                      | Description                                                                                                                  | Default                   | `_FILE` |
+| ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------- | ------- |
+| `COMPRESSION`                  | Use either Gzip `GZ`, Bzip2 `BZ`, XZip `XZ`, ZSTD `ZSTD` or none `NONE`                                                      | `ZSTD`                    |         |
+| `COMPRESSION_LEVEL`            | Numberical value of what level of compression to use, most allow `1` to `9` except for `ZSTD` which allows for `1` to `19` - | `3`                       |         |
+| `ENABLE_PARALLEL_COMPRESSION`  | Use multiple cores when compressing backups `TRUE` or `FALSE`                                                                | `TRUE`                    |         |
+| `PARALLEL_COMPRESSION_THREADS` | Maximum amount of threads to use when compressing - Integer value e.g. `8`                                                   | `autodetected`            |         |
+| `GZ_RSYNCABLE`                 | Use `--rsyncable` (gzip only) for faster rsync transfers and incremental backup deduplication. e.g. `TRUE`                   | `FALSE`                   |         |
+| `ENABLE_CHECKSUM`              | Generate either a MD5 or SHA1 in Directory, `TRUE` or `FALSE`                                                                | `TRUE`                    |         |
+| `CHECKSUM`                     | Either `MD5` or `SHA1`                                                                                                       | `MD5`                     |         |
+| `EXTRA_OPTS`                   | If you need to pass extra arguments to the backup command, add them here e.g. `--extra-command`                              |                           |         |
+| `MYSQL_MAX_ALLOWED_PACKET`     | Max allowed packet if backing up MySQL / MariaDB                                                                             | `512M`                    |         |
+| `MYSQL_SINGLE_TRANSACTION`     | Backup in a single transaction with MySQL / MariaDB                                                                          | `TRUE`                    |         |
+| `MYSQL_STORED_PROCEDURES`      | Backup stored procedures with MySQL / MariaDB                                                                                | `TRUE`                    |         |
+| `MYSQL_ENABLE_TLS`             | Enable TLS functionality for MySQL client                                                                                    | `FALSE`                   |         |
+| `MYSQL_TLS_VERIFY`             | (optional) If using TLS (by means of MYSQL_TLS_* variables) verify remote host                                               | `FALSE`                   |         |
+| `MYSQL_TLS_VERSION`            | What TLS `v1.1` `v1.2` `v1.3` version to utilize                                                                             | `TLSv1.1,TLSv1.2,TLSv1.3` |         |
+| `MYSQL_TLS_CA_FILE`            | Filename to load custom CA certificate for connecting via TLS                                                                | `/etc/ssl/cert.pem`       | x       |
+| `MYSQL_TLS_CERT_FILE`          | Filename to load client certificate for connecting via TLS                                                                   |                           | x       |
+| `MYSQL_TLS_KEY_FILE`           | Filename to load client key for connecting via TLS                                                                           |                           | x       |

 - When using compression with MongoDB, only `GZ` compression is possible.

@@ -171,23 +204,39 @@ Be sure to view the following repositories to understand all the customizable op

 If `BACKUP_LOCATION` = `S3` then the following options are used.

-| Parameter             | Description                                                                               | Default |
-| --------------------- | ----------------------------------------------------------------------------------------- | ------- |
-| `S3_BUCKET`           | S3 Bucket name e.g. `mybucket`                                                            |         |
-| `S3_KEY_ID`           | S3 Key ID                                                                                 |         |
-| `S3_KEY_SECRET`       | S3 Key Secret                                                                             |         |
-| `S3_PATH`             | S3 Pathname to save to e.g. '`backup`'                                                    |         |
-| `S3_REGION`           | Define region in which bucket is defined. Example: `ap-northeast-2`                       |         |
-| `S3_HOST`             | Hostname (and port) of S3-compatible service, e.g. `minio:8080`. Defaults to AWS.         |         |
-| `S3_PROTOCOL`         | Protocol to connect to `S3_HOST`. Either `http` or `https`. Defaults to `https`.          | `https` |
-| `S3_EXTRA_OPTS`       | Add any extra options to the end of the `aws-cli` process execution                       |         |
-| `S3_CERT_CA_FILE`     | Map a volume and point to your custom CA Bundle for verification e.g. `/certs/bundle.pem` |         |
-| _*OR*_                |                                                                                           |         |
-| `S3_CERT_SKIP_VERIFY` | Skip verifying self signed certificates when connecting                                   | `TRUE`  |
+| Parameter             | Description                                                                               | Default | `_FILE` |
+| --------------------- | ----------------------------------------------------------------------------------------- | ------- | ------- |
+| `S3_BUCKET`           | S3 Bucket name e.g. `mybucket`                                                            |         | x       |
+| `S3_KEY_ID`           | S3 Key ID (Optional)                                                                      |         | x       |
+| `S3_KEY_SECRET`       | S3 Key Secret (Optional)                                                                  |         | x       |
+| `S3_PATH`             | S3 Pathname to save to (must NOT end in a trailing slash e.g. '`backup`')                 |         | x       |
+| `S3_REGION`           | Define region in which bucket is defined. Example: `ap-northeast-2`                       |         | x       |
+| `S3_HOST`             | Hostname (and port) of S3-compatible service, e.g. `minio:8080`. Defaults to AWS.         |         | x       |
+| `S3_PROTOCOL`         | Protocol to connect to `S3_HOST`. Either `http` or `https`. Defaults to `https`.          | `https` | x       |
+| `S3_EXTRA_OPTS`       | Add any extra options to the end of the `aws-cli` process execution                       |         | x       |
+| `S3_CERT_CA_FILE`     | Map a volume and point to your custom CA Bundle for verification e.g. `/certs/bundle.pem` |         | x       |
+| _*OR*_                |                                                                                           |         |         |
+| `S3_CERT_SKIP_VERIFY` | Skip verifying self signed certificates when connecting                                   | `TRUE`  |         |
+
+- When `S3_KEY_ID` and/or `S3_KEY_SECRET` is not set, will try to use IAM role assigned (if any) for uploading the backup files to S3 bucket.
+
+#### Upload to a Azure storage account by `blobxfer`
+
+Support to upload backup files with [blobxfer](https://github.com/Azure/blobxfer) to the Azure fileshare storage.
+
+If `BACKUP_LOCATION` = `blobxfer` then the following options are used.
+
+| Parameter                      | Description                                 | Default             | `_FILE` |
+| ------------------------------ | ------------------------------------------- | ------------------- | ------- |
+| `BLOBXFER_STORAGE_ACCOUNT`     | Microsoft Azure Cloud storage account name. |                     | x       |
+| `BLOBXFER_STORAGE_ACCOUNT_KEY` | Microsoft Azure Cloud storage account key.  |                     | x       |
+| `BLOBXFER_REMOTE_PATH`         | Remote Azure path                           | `/docker-db-backup` | x       |
+
+> This service uploads files from backup targed directory `DB_DUMP_TARGET`.
+> If the a cleanup configuration in `DB_CLEANUP_TIME` is defined, the remote directory on Azure storage will also be cleaned automatically.

 ## Maintenance

-
 ### Shell Access

 For debugging and maintenance purposes you may want access the containers shell.
@@ -198,10 +247,10 @@ docker exec -it (whatever your container name is) bash
 ### Manual Backups
 Manual Backups can be performed by entering the container and typing `backup-now`

- Recently there was a request to have the container work with Kukbernetes cron scheduling. This can theoretically be accomplished by setting the container `MODE=MANUAL` and then setting `MANUAL_RUN_FOREVER=FALSE` - You would also want to disable a few features from the upstream base images specifically `CONTAINER_ENABLE_SCHEDULING` and `CONTAINER_ENABLE_MONITORING`. This should allow the container to start, execute a backup by executing and then exit cleanly. An alternative way to running the script is to execute `/etc/services.available/10-db-backup/run`.
+- Recently there was a request to have the container work with Kubernetes cron scheduling. This can theoretically be accomplished by setting the container `MODE=MANUAL` and then setting `MANUAL_RUN_FOREVER=FALSE` - You would also want to disable a few features from the upstream base images specifically `CONTAINER_ENABLE_SCHEDULING` and `CONTAINER_ENABLE_MONITORING`. This should allow the container to start, execute a backup by executing and then exit cleanly. An alternative way to running the script is to execute `/etc/services.available/10-db-backup/run`.

 ### Restoring Databases
-Entering in the container and executing `restore` will execute a menu based script to restore your backups.
+Entering in the container and executing `restore` will execute a menu based script to restore your backups - MariaDB, Postgres, and Mongo supported.

 You will be presented with a series of menus allowing you to choose:
   - What file to restore
@@ -223,7 +272,41 @@ If you only enter some of the arguments you will be prompted to fill them in.

 ### Custom Scripts

-If you want to execute a custom script at the end of backup, you can drop bash scripts with the extension of `.sh` in this directory. See the following example to utilize:
+#### Path Options
+
+| Parameter              | Description                                                                 | Default                 |
+| ---------------------- | --------------------------------------------------------------------------- | ----------------------- |
+| `SCRIPT_LOCATION_PRE`  | Location on filesystem inside container to execute bash scripts pre backup  | `/assets/scripts/pre/`  |
+| `SCRIPT_LOCATION_POST` | Location on filesystem inside container to execute bash scripts post backup | `/assets/scripts/post/` |
+
+#### Pre Backup
+If you want to execute a custom script before a backup starts, you can drop bash scripts with the extension of `.sh` in the location defined in `SCRIPT_LOCATION_PRE`. See the following example to utilize:
+
+````bash
+$ cat pre-script.sh
+##!/bin/bash
+
+# #### Example Pre Script
+# #### $1=DB_TYPE (Type of Backup)
+# #### $2=DB_HOST (Backup Host)
+# #### $3=DB_NAME (Name of Database backed up
+# #### $4=BACKUP START TIME (Seconds since Epoch)ff
+# #### $5=BACKUP FILENAME (Filename)
+
+echo "${1} Backup Starting on ${2} for ${3} at ${4}. Filename: ${5}"
+````
+
+    ## script DB_TYPE DB_HOST DB_NAME STARTEPOCH BACKUP_FILENAME
+    ${f} "${dbtype}" "${dbhost}" "${dbname}" "${backup_start_time}" "${target}"
+
+
+Outputs the following on the console:
+
+`mysql Backup Starting on example-db for example at 1647370800. Filename: mysql_example_example-db_202200315-000000.sql.bz2
+
+
+#### Post backup
+If you want to execute a custom script at the end of a backup, you can drop bash scripts with the extension of `.sh` in the location defined in `SCRIPT_LOCATION_POST`. Also to support legacy users `/assets/custom-scripts` is also scanned and executed.See the following example to utilize:

 ````bash
 $ cat post-script.sh
@@ -254,12 +337,15 @@ Outputs the following on the console:

 If you wish to change the size value from bytes to megabytes set environment variable `SIZE_VALUE=megabytes`

+You must make your scripts executible otherwise there is an internal check that will skip trying to run it otherwise.
+If for some reason your filesystem or host is not detecting it right, use the environment variable `POST_SCRIPT_SKIP_X_VERIFY=TRUE` to bypass.
+
 ## Support

 These images were built to serve a specific need in a production environment and gradually have had more functionality added based on requests from the community.
 ### Usage
 - The [Discussions board](../../discussions) is a great place for working with the community on tips and tricks of using this image.
- Consider [sponsoring me](https://github.com/sponsors/tiredofit) personalized support.
+- Consider [sponsoring me](https://github.com/sponsors/tiredofit) for personalized support
 ### Bugfixes
 - Please, submit a [Bug Report](issues/new) if something isn't working as expected. I'll do my best to issue a fix in short order.

--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -0,0 +1,5 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# Example container mounted folders
+**/backups/
+**/db/
--- a/examples/docker-compose.yml
+++ b/examples/docker-compose.yml
@@ -1,38 +0,0 @@
-version: '2'
-
-services:
-  example-db:
-    container_name: example-db
-    image: mariadb:latest
-    volumes:
-      - ./db:/var/lib/mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=examplerootpassword
-      - MYSQL_DATABASE=example
-      - MYSQL_USER=example
-      - MYSQL_PASSWORD=examplepassword
-    restart: always
-
-  example-db-backup:
-    container_name: example-db-backup
-    image: tiredofit/db-backup
-    links:
-     - example-db
-    volumes:
-      - ./backups:/backup
-      - ./post-script.sh:/assets/custom-scripts/post-script.sh
-    environment:
-      - DB_TYPE=mariadb
-      - DB_HOST=example-db
-      - DB_NAME=example
-      - DB_USER=example
-      - DB_PASS="examplepassword"
-      - DB_DUMP_FREQ=1440
-      - DB_DUMP_BEGIN=0000
-      - DB_CLEANUP_TIME=8640
-      - CHECKSUM=MD5
-      - COMPRESSION=XZ
-      - SPLIT_DB=FALSE
-    restart: always
-
-
--- a/examples/mssql-blobxfer/docker-compose.yml
+++ b/examples/mssql-blobxfer/docker-compose.yml
@@ -0,0 +1,69 @@
+# 
+# Example for Microsoft SQL Server
+# upload with blobxfer to azure storage
+# 
+
+version: '2'
+
+networks:
+  example-mssql-blobxfer-net:
+    name: example-mssql-blobxfer-net
+
+services:
+  example-mssql-s3-db:
+    hostname: example-db-host
+    image: mcr.microsoft.com/mssql/server:2019-latest
+    container_name: example-mssql-s3-db
+    restart: unless-stopped
+    ports:
+      - "127.0.0.1:11433:1433"
+    networks:
+      example-mssql-blobxfer-net:
+    volumes:
+      - ./tmp/backups:/tmp/backups    # shared tmp backup directory
+    environment:
+      ACCEPT_EULA: Y
+      MSSQL_SA_PASSWORD: 5hQa0utRFBpIY3yhoIyE
+      MSSQL_PID: Express
+
+  example-mssql-blobxfer-db-backup:
+    container_name: example-mssql-blobxfer-db-backup
+    # if you want to build and use image from current source
+    # execute in terminal --> docker build -t tiredofit/db-backup-mssql-blobxfer .
+    # replace --> image: tiredofit/db-backup-mssql
+    # image: tiredofit/db-backup
+    image: tiredofit/db-backup-mssql-blobxfer
+    links:
+     - example-mssql-s3-db
+    volumes:
+      - ./backups:/backup
+      - ./tmp/backups:/tmp/backups    # shared tmp backup directory
+      #- ./post-script.sh:/assets/custom-scripts/post-script.sh
+    environment:
+      # - DEBUG_MODE=TRUE
+      - DB_TYPE=mssql
+      - DB_HOST=example-db-host
+      # - DB_PORT=1488
+      # - DB_NAME=ALL             # [ALL] not working on sql server.
+      # create database with name `test1` manually first
+      - DB_NAME=test1             # Create this database
+      - DB_USER=sa
+      - DB_PASS=5hQa0utRFBpIY3yhoIyE
+      - DB_DUMP_FREQ=1            # backup every 5 minute
+      # - DB_DUMP_BEGIN=0000      # backup starts immediately
+      - DB_CLEANUP_TIME=3         # clean backups they are older than 60 minutes
+      - ENABLE_CHECKSUM=TRUE
+      - CHECKSUM=SHA1
+      - COMPRESSION=GZ
+      - SPLIT_DB=FALSE
+      - CONTAINER_ENABLE_MONITORING=FALSE
+      # === S3 Blobxfer ===
+      - BACKUP_LOCATION=blobxfer
+      # Add here azure storage account
+      - BLOBXFER_STORAGE_ACCOUNT={TODO Add Storage Name}
+      # Add here azure storage account key
+      - BLOBXFER_STORAGE_ACCOUNT_KEY={TODO Add Key}
+      - BLOBXFER_REMOTE_PATH=docker-db-backup
+    restart: always
+    networks:
+      example-mssql-blobxfer-net:
--- a/examples/mssql/docker-compose.yml
+++ b/examples/mssql/docker-compose.yml
@@ -0,0 +1,61 @@
+# 
+# Example for Microsoft SQL Server
+# 
+
+version: '2'
+
+networks:
+  example-mssql-net:
+    name: example-mssql-net
+
+services:
+  example-mssql-db:
+    hostname: example-db-host
+    image: mcr.microsoft.com/mssql/server:2019-latest
+    container_name: example-mssql-db
+    restart: unless-stopped
+    ports:
+      - "127.0.0.1:11433:1433"
+    networks:
+      example-mssql-net:
+    volumes:
+      - ./tmp/backups:/tmp/backups    # shared tmp backup directory
+    environment:
+      ACCEPT_EULA: Y
+      MSSQL_SA_PASSWORD: 5hQa0utRFBpIY3yhoIyE
+      MSSQL_PID: Express
+
+  example-mssql-db-backup:
+    container_name: example-mssql-db-backup
+    # if you want to build and use image from current source
+    # execute in terminal --> docker build -t tiredofit/db-backup-mssql .
+    # replace --> image: tiredofit/db-backup-mssql
+    # image: tiredofit/db-backup
+    image: tiredofit/db-backup-mssql
+    links:
+     - example-mssql-db
+    volumes:
+      - ./backups:/backup
+      - ./tmp/backups:/tmp/backups    # shared tmp backup directory
+      #- ./post-script.sh:/assets/custom-scripts/post-script.sh
+    environment:
+      # - DEBUG_MODE=TRUE
+      - DB_TYPE=mssql
+      - DB_HOST=example-db-host
+      # - DB_PORT=1488
+      # - DB_NAME=ALL             # [ALL] not working on sql server.
+      # create database with name `test1` manually first
+      - DB_NAME=test1
+      - DB_USER=sa
+      - DB_PASS=5hQa0utRFBpIY3yhoIyE
+      - DB_DUMP_FREQ=1            # backup every minute
+      # - DB_DUMP_BEGIN=0000      # backup starts immediately
+      - DB_CLEANUP_TIME=5         # clean backups they are older than 5 minute
+      - ENABLE_CHECKSUM=FALSE
+      - CHECKSUM=SHA1
+      - COMPRESSION=GZ
+      - SPLIT_DB=FALSE
+      - CONTAINER_ENABLE_MONITORING=FALSE
+    restart: always
+    networks:
+      example-mssql-net:
--- a/examples/mysql/docker-compose.yml
+++ b/examples/mysql/docker-compose.yml
@@ -0,0 +1,51 @@
+version: '2'
+
+networks:
+  example-db-network:
+    name: example-db-network
+
+services:
+  example-db:
+    hostname: example-db-host
+    container_name: example-db
+    image: mariadb:latest
+    ports:
+      - 13306:3306
+    volumes:
+      - ./db:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=examplerootpassword
+      - MYSQL_DATABASE=example
+      - MYSQL_USER=example
+      - MYSQL_PASSWORD=examplepassword
+    restart: always
+    networks:
+      - example-db-network
+
+  example-db-backup:
+    container_name: example-db-backup
+    image: tiredofit/db-backup
+    links:
+     - example-db
+    volumes:
+      - ./backups:/backup
+      #- ./post-script.sh:/assets/custom-scripts/post-script.sh
+    environment:
+      # - DEBUG_MODE=TRUE
+      - DB_TYPE=mariadb
+      - DB_HOST=example-db-host
+      - DB_NAME=example
+      - DB_USER=example
+      - DB_PASS=examplepassword
+      - DB_DUMP_FREQ=1            # backup every minute
+      # - DB_DUMP_BEGIN=0000      # backup starts immediately
+      - DB_CLEANUP_TIME=5         # clean backups they are older than 5 minute
+      - CHECKSUM=SHA1
+      - COMPRESSION=GZ
+      - SPLIT_DB=FALSE
+      - CONTAINER_ENABLE_MONITORING=FALSE
+    restart: always
+    networks:
+      - example-db-network
+
+
--- a/examples/mysql/post-script.sh
+++ b/examples/mysql/post-script.sh
--- a/install/assets/defaults/10-db-backup
+++ b/install/assets/defaults/10-db-backup
@@ -1,27 +1,32 @@
 #!/command/with-contenv bash

 BACKUP_LOCATION=${BACKUP_LOCATION:-"FILESYSTEM"}
+BLOBXFER_REMOTE_PATH=${BLOBXFER_REMOTE_PATH:-"/docker-db-backup"}
 CHECKSUM=${CHECKSUM:-"MD5"}
-COMPRESSION=${COMPRESSION:-"GZ"}
+COMPRESSION=${COMPRESSION:-"ZSTD"}
 COMPRESSION_LEVEL=${COMPRESSION_LEVEL:-"3"}
+CREATE_LATEST_SYMLINK=${CREATE_LATEST_SYMLINK:-"TRUE"}
 DB_DUMP_BEGIN=${DB_DUMP_BEGIN:-+0}
 DB_DUMP_FREQ=${DB_DUMP_FREQ:-1440}
 DB_DUMP_TARGET=${DB_DUMP_TARGET:-"/backup"}
+DB_DUMP_TARGET_ARCHIVE=${DB_DUMP_TARGET_ARCHIVE:-"${DB_DUMP_TARGET}/archive/"}
 ENABLE_CHECKSUM=${ENABLE_CHECKSUM:-"TRUE"}
 ENABLE_PARALLEL_COMPRESSION=${ENABLE_PARALLEL_COMPRESSION:-"TRUE"}
 MANUAL_RUN_FOREVER=${MANUAL_RUN_FOREVER:-"TRUE"}
 MODE=${MODE:-"AUTO"}
+MYSQL_ENABLE_TLS=${MYSQL_ENABLE_TLS:-"FALSE"}
 MYSQL_MAX_ALLOWED_PACKET=${MYSQL_MAX_ALLOWED_PACKET:-"512M"}
 MYSQL_SINGLE_TRANSACTION=${MYSQL_SINGLE_TRANSACTION:-"TRUE"}
 MYSQL_STORED_PROCEDURES=${MYSQL_STORED_PROCEDURES:-"TRUE"}
+MYSQL_TLS_CA_FILE=${MYSQL_TLS_CA_FILE:-"/etc/ssl/cert.pem"}
+MYSQL_TLS_VERIFY=${MYSQL_TLS_VERIFY:-"FALSE"}
+MYSQL_TLS_VERSION=${MYSQL_TLS_VERSION:-"TLSv1.1,TLSv1.2,TLSv1.3"}
 PARALLEL_COMPRESSION_THREADS=${PARALLEL_COMPRESSION_THREADS:-"$(nproc)"}
 S3_CERT_SKIP_VERIFY=${S3_CERT_SKIP_VERIFY:-"TRUE"}
 S3_PROTOCOL=${S3_PROTOCOL:-"https"}
+SCRIPT_LOCATION_PRE=${SCRIPT_LOCATION_PRE:-"/assets/scripts/pre/"}
+SCRIPT_LOCATION_POST=${SCRIPT_LOCATION_POST:-"/assets/scripts/post/"}
 SIZE_VALUE=${SIZE_VALUE:-"bytes"}
-SPLIT_DB=${SPLIT_DB:-"FALSE"}
+SKIP_AVAILABILITY_CHECK=${SKIP_AVAILABILITY_CHECK:-"FALSE"}
+SPLIT_DB=${SPLIT_DB:-"TRUE"}
 TEMP_LOCATION=${TEMP_LOCATION:-"/tmp/backups"}
-dbhost=${DB_HOST}
-dbname=${DB_NAME}
-dbpass=${DB_PASS}
-dbtype=${DB_TYPE}
-dbuser=${DB_USER}
--- a/install/assets/functions/10-db-backup
+++ b/install/assets/functions/10-db-backup
--- a/install/etc/cont-init.d/10-db-backup
+++ b/install/etc/cont-init.d/10-db-backup
@@ -6,6 +6,7 @@ prepare_service 03-monitoring
 PROCESS_NAME="db-backup"
 output_off

+bootstrap_variables
 sanity_test
 setup_mode
 create_zabbix dbbackup
--- a/install/etc/services.available/10-db-backup/run
+++ b/install/etc/services.available/10-db-backup/run
@@ -5,64 +5,36 @@ source /assets/functions/10-db-backup
 source /assets/defaults/10-db-backup
 PROCESS_NAME="db-backup"

-bootstrap_compression
 bootstrap_variables

-if [ "${MODE,,}" = "manual" ] ; then
+if [ "${MODE,,}" = "manual" ] || [ "${1,,}" = "manual" ] || [ "${1,,}" = "now" ]; then
    DB_DUMP_BEGIN=+0
    manual=TRUE
+    print_debug "Detected Manual Mode"
+else
+    sleep 5
+    current_time=$(date +"%s")
+    today=$(date +"%Y%m%d")
+
+    if [[ $DB_DUMP_BEGIN =~ ^\+(.*)$ ]]; then
+        waittime=$(( ${BASH_REMATCH[1]} * 60 ))
+        target_time=$(($current_time + $waittime))
+    else
+        target_time=$(date --date="${today}${DB_DUMP_BEGIN}" +"%s")
+        if [[ "$target_time" < "$current_time" ]]; then
+            target_time=$(($target_time + 24*60*60))
+        fi
+        waittime=$(($target_time - $current_time))
+    fi
+    print_debug "Wait Time: ${waittime} Target time: ${target_time} Current Time: ${current_time}"
+    print_info "Next Backup at $(date -d @${target_time} +"%Y-%m-%d %T %Z")"
+    sleep $waittime
 fi

-case "${1,,}" in
-    "now" | "manual" )
-        DB_DUMP_BEGIN=+0
-        manual=TRUE
-    ;;
-    * )
-        sleep 5
-    ;;
-esac
-
-### Container Startup
-print_debug "Backup routines Initialized on $(date)"
-
-### Wait for Next time to start backup
-case "${1,,}" in
-    "now" | "manual" )
-        :
-    ;;
-    * )
-        if [ "${manual,,}" = "true" ]; then
-            current_time=$(date +"%s")
-            today=$(date +"%Y%m%d")
-
-            if [[ $DB_DUMP_BEGIN =~ ^\+(.*)$ ]]; then
-                waittime=$(( ${BASH_REMATCH[1]} * 60 ))
-                target_time=$(($current_time + $waittime))
-            else
-                target_time=$(date --date="${today}${DB_DUMP_BEGIN}" +"%s")
-                if [[ "$target_time" < "$current_time" ]]; then
-                    target_time=$(($target_time + 24*60*60))
-                fi
-                waittime=$(($target_time - $current_time))
-            fi
-                print_debug "Wait Time: ${waittime} Target time: ${target_time} Current Time: ${current_time}"
-                print_info "Next Backup at $(date -d @${target_time} +"%Y-%m-%d %T %Z")"
-                sleep $waittime
-        fi
-    ;;
-esac
-
-### Commence Backup
 while true; do
    mkdir -p "${TEMP_LOCATION}"
    backup_start_time=$(date +"%s")
-    now=$(date +"%Y%m%d-%H%M%S")
-    now_time=$(date +"%H:%M:%S")
-    now_date=$(date +"%Y-%m-%d")
-    target=${dbtype}_${dbname}_${dbhost}_${now}.sql
-
-    ### Take a Dump
+    print_debug "Backup routines started time: $(date +'%Y-%m-%d %T %Z')"
    case "${dbtype,,}" in
        "couch" )
            check_availability
@@ -100,48 +72,17 @@ while true; do

    backup_finish_time=$(date +"%s")
    backup_total_time=$(echo $((backup_finish_time-backup_start_time)))
+    if [ -z "$master_exit_code" ] ; then master_exit_code="0" ; fi
+    print_info "Backup routines finish time: $(date -d @${backup_finish_time} +"%Y-%m-%d %T %Z") with overall exit code ${master_exit_code}"
+    print_notice "Backup routines time taken: $(echo ${backup_total_time} | awk '{printf "Hours: %d Minutes: %02d Seconds: %02d", $1/3600, ($1/60)%60, $1%60}')"

-    print_info "Backup finish time: $(date -d @${backup_finish_time} +"%Y-%m-%d %T %Z") with exit code ${exit_code}"
-    print_notice "Backup time elapsed: $(echo ${backup_total_time} | awk '{printf "Hours: %d Minutes: %02d Seconds: %02d", $1/3600, ($1/60)%60, $1%60}')"
-
-    ### Zabbix / Monitoring stats
-    if var_true "${CONTAINER_ENABLE_MONITORING}" ; then
-        print_notice "Sending Backup Statistics to Zabbix"
-        silent zabbix_sender -c /etc/zabbix/zabbix_agentd.conf -k dbbackup.size -o "$(stat -c%s "${DB_DUMP_TARGET}"/"${target}")"
-        silent zabbix_sender -c /etc/zabbix/zabbix_agentd.conf -k dbbackup.datetime -o "$(date -r  "${DB_DUMP_TARGET}"/"${target}" +'%s')"
-        silent zabbix_sender -c /etc/zabbix/zabbix_agentd.conf -k dbbackup.status -o "${exit_code}"
-        silent zabbix_sender -c /etc/zabbix/zabbix_agentd.conf -k dbbackup.backup_duration -o "$(echo $((backup_finish_time-backup_start_time)))"
-    fi
-
-    ### Automatic Cleanup
-    if [ -n "${DB_CLEANUP_TIME}" ]; then
-        print_info "Cleaning up old backups"
-        mkdir -p "${DB_DUMP_TARGET}"
-        find "${DB_DUMP_TARGET}"/  -mmin +"${DB_CLEANUP_TIME}" -iname "*" -exec rm {} \;
-    fi
-
-    ### Post Script Support
-    if [ -n "${POST_SCRIPT}" ] ; then
-        print_notice "Found POST_SCRIPT environment variable. Executing '${POST_SCRIPT}"
-        eval "${POST_SCRIPT}" "${exit_code}" "${dbtype}" "${dbhost}" "${dbname}" "${backup_start_time}" "${backup_finish_time}" "${backup_total_time}" "${target}" "${FILESIZE}" "${checksum_value}"
-    fi
-
-    ### Post Backup Custom Script Support
-    if [ -d "/assets/custom-scripts/" ] ; then
-    print_notice "Found Post Backup Custom Script to execute"
-    for f in $(find /assets/custom-scripts/ -name \*.sh -type f); do
-      print_notice "Running Script: '${f}'"
-      ## script EXIT_CODE DB_TYPE DB_HOST DB_NAME STARTEPOCH FINISHEPOCH DURATIONEPOCH BACKUP_FILENAME FILESIZE CHECKSUMVALUE
-      ${f} "${exit_code}" "${dbtype}" "${dbhost}" "${dbname}" "${backup_start_time}" "${backup_finish_time}" "${backup_total_time}" "${target}" "${FILESIZE}" "${checksum_value}"
-    done
-    fi
+    cleanup_old_data

    if var_true "${manual}" ; then
-        print_debug "Exitting due to manual mode"
-        exit ${exit_code};
+        print_debug "Exiting due to manual mode"
+        exit ${master_exit_code};
    else
-        ### Go back to sleep until next backup time
-        sleep $(($DB_DUMP_FREQ*60-backup_total_time))
        print_notice "Sleeping for another $(($DB_DUMP_FREQ*60-backup_total_time)) seconds. Waking up at $(date -d@"$(( $(date +%s)+$(($DB_DUMP_FREQ*60-backup_total_time))))" +"%Y-%m-%d %T %Z") "
+        sleep $(($DB_DUMP_FREQ*60-backup_total_time))
    fi
 done
--- 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.
@@ -55,7 +55,7 @@ The image will also allow you to use environment variables or Docker secrets use

 The script can also be executed skipping the interactive mode by using the following syntax/

-    $(basename $0) <filename> <db_type> <db_hostname> <db_name> <db_user> <db_pass> <db_port>
+    $(basename "$0") <filename> <db_type> <db_hostname> <db_name> <db_user> <db_pass> <db_port>

 If you only enter some of the arguments you will be prompted to fill them in.

@@ -70,7 +70,7 @@ EOF
            interactive_mode=true
        ;;
        * )
-        interactive_mode=false
+            interactive_mode=false
        ;;
    esac
 fi
@@ -78,7 +78,7 @@ fi
 get_filename() {
    COLUMNS=12
    prompt="Please select a file to restore:"
-    options=( $(find ${DB_DUMP_TARGET} -type f -maxdepth 1  -not -name '*.md5' -not -name '*.sha1' -print0 | xargs -0) )
+    options=( $(find "${DB_DUMP_TARGET}" -type f -maxdepth 1  -not -name '*.md5' -not -name '*.sha1' -print0 | xargs -0) )
    PS3="$prompt "
    select opt in "${options[@]}" "Custom" "Quit" ; do
        if (( REPLY == 2 + ${#options[@]} )) ; then
@@ -110,7 +110,7 @@ get_dbhost() {
        print_debug "Parsed DBHost: ${p_dbhost}"
    fi

-    if [ -z "${dbhost}" ] && [ -z "${parsed_host}" ]; then
+    if [ -z "${DB_HOST}" ] && [ -z "${parsed_host}" ]; then
        print_debug "Parsed DBHost Variant: 1 - No Env, No Parsed Filename"
        q_dbhost_variant=1
        q_dbhost_menu=$(cat <<EOF
@@ -119,7 +119,7 @@ EOF
                        )
    fi

-    if [ -n "${dbhost}" ] && [ -z "${parsed_host}" ]; then
+    if [ -n "${DB_HOST}" ] && [ -z "${parsed_host}" ]; then
        print_debug "Parsed DBHost Variant: 2 - Env, No Parsed Filename"
        q_dbhost_variant=2
        q_dbhost_menu=$(cat <<EOF
@@ -130,7 +130,7 @@ EOF
                        )
    fi

-    if [ -z "${dbhost}" ] && [ -n "${parsed_host}" ]; then
+    if [ -z "${DB_HOST}" ] && [ -n "${parsed_host}" ]; then
        print_debug "Parsed DBHostpho Variant: 3 - No Env, Parsed Filename"
        q_dbhost_variant=3
        q_dbhost_menu=$(cat <<EOF
@@ -141,7 +141,7 @@ EOF
                        )
    fi

-    if [ -n "${dbhost}" ] && [ -n "${parsed_host}" ]; then
+    if [ -n "${DB_HOST}" ] && [ -n "${parsed_host}" ]; then
        print_debug "Parsed DBHost Variant: 4 - Env, Parsed Filename"
        q_dbhost_variant=4
        q_dbhost_menu=$(cat <<EOF
@@ -188,7 +188,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbhost=${dbhost}
+                        r_dbhost=${DB_HOST}
                        break
                    ;;
                    q*  )
@@ -241,7 +241,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbhost=${dbhost}
+                        r_dbhost=${DB_HOST}
                        break
                    ;;
                    f* )
@@ -263,11 +263,15 @@ get_dbtype() {
    p_dbtype=$(basename -- "${r_filename}" | cut -d _ -f 1)

    case "${p_dbtype}" in
+        mongo* )
+            parsed_type=true
+            print_debug "Parsed DBType: MongoDB"
+        ;;
        mariadb | mysql )
            parsed_type=true
            print_debug "Parsed DBType: MariaDB/MySQL"
        ;;
-        psql | postgres* )
+        pgsql | postgres* )
            parsed_type=true
            print_debug "Parsed DBType: Postgresql"
        ;;
@@ -276,7 +280,7 @@ get_dbtype() {
        ;;
    esac

-    if [ -z "${dbtype}" ] && [ -z "${parsed_type}" ]; then
+    if [ -z "${DB_TYPE}" ] && [ -z "${parsed_type}" ]; then
        print_debug "Parsed DBType Variant: 1 - No Env, No Parsed Filename"
        q_dbtype_variant=1
        q_dbtype_menu=$(cat <<EOF
@@ -285,7 +289,7 @@ EOF
                        )
    fi

-    if [ -n "${dbtype}" ] && [ -z "${parsed_type}" ]; then
+    if [ -n "${DB_TYPE}" ] && [ -z "${parsed_type}" ]; then
        print_debug "Parsed DBType Variant: 2 - Env, No Parsed Filename"
        q_dbtype_variant=2
        q_dbtype_menu=$(cat <<EOF
@@ -295,7 +299,7 @@ EOF
                        )
    fi

-    if [ -z "${dbtype}" ] && [ -n "${parsed_type}" ]; then
+    if [ -z "${DB_TYPE}" ] && [ -n "${parsed_type}" ]; then
        print_debug "Parsed DBType Variant: 3 - No Env, Parsed Filename"
        q_dbtype_variant=3
        q_dbtype_menu=$(cat <<EOF
@@ -305,7 +309,7 @@ EOF
                        )
    fi

-    if [ -n "${dbtype}" ] && [ -n "${parsed_type}" ]; then
+    if [ -n "${DB_TYPE}" ] && [ -n "${parsed_type}" ]; then
        print_debug "Parsed DBType Variant: 4 - Env, Parsed Filename"
        q_dbtype_variant=4
        q_dbtype_menu=$(cat <<EOF
@@ -320,7 +324,9 @@ EOF

 What Database Type are you looking to restore?
 ${q_dbtype_menu}
+
    M ) MySQL / MariaDB
+    O ) MongoDB
    P ) Postgresql
    Q ) Quit

@@ -335,6 +341,10 @@ EOF
                        r_dbtype=mysql
                        break
                    ;;
+                    o* )
+                        r_dbtype=mongo
+                        break
+                    ;;
                    p* )
                        r_dbtype=postgresql
                        break
@@ -351,13 +361,17 @@ EOF
                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}E${cdgy}\) \| \(${cwh}M${cdgy}\) \| \(${cwh}P${cdgy}\) : ${cwh}${coff}) " q_dbtype
                case "${q_dbtype,,}" in
                    e* | "" )
-                        r_dbtype=${db_name}
+                        r_dbtype=${DB_TYPE}
                        break
                    ;;
                    m* )
                        r_dbtype=mysql
                        break
                    ;;
+                    o* )
+                        r_dbtype=mongo
+                        break
+                    ;;
                    p* )
                        r_dbtype=postgresql
                        break
@@ -381,6 +395,10 @@ EOF
                        r_dbtype=mysql
                        break
                    ;;
+                    o* )
+                        r_dbtype=mongo
+                        break
+                    ;;
                    p* )
                        r_dbtype=postgresql
                        break
@@ -398,7 +416,7 @@ EOF
                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}E${cdgy}\) \| \(${cwh}F${cdgy}\) \| \(${cwh}M${cdgy}\) \| \(${cwh}P${cdgy}\) : ${cwh}${coff}) " q_dbtype
                case "${q_dbtype,,}" in
                    e* | "" )
-                        r_dbtype=${dbtype}
+                        r_dbtype=${DB_TYPE}
                        break
                    ;;
                    f* )
@@ -431,7 +449,7 @@ get_dbname() {
        print_debug "Parsed DBName: ${p_dbhost}"
    fi

-    if [ -z "${dbname}" ] && [ -z "${parsed_name}" ]; then
+    if [ -z "${DB_NAME}" ] && [ -z "${parsed_name}" ]; then
        print_debug "Parsed DBName Variant: 1 - No Env, No Parsed Filename"
        q_dbname_variant=1
        q_dbname_menu=$(cat <<EOF
@@ -440,7 +458,7 @@ EOF
                        )
    fi

-    if [ -n "${dbname}" ] && [ -z "${parsed_name}" ]; then
+    if [ -n "${DB_NAME}" ] && [ -z "${parsed_name}" ]; then
        print_debug "Parsed DBName Variant: 2 - Env, No Parsed Filename"
        q_dbname_variant=2
        q_dbname_menu=$(cat <<EOF
@@ -451,7 +469,7 @@ EOF
                        )
    fi

-    if [ -z "${dbname}" ] && [ -n "${parsed_name}" ]; then
+    if [ -z "${DB_NAME}" ] && [ -n "${parsed_name}" ]; then
        print_debug "Parsed DBName Variant: 3 - No Env, Parsed Filename"
        q_dbname_variant=3
        q_dbname_menu=$(cat <<EOF
@@ -462,7 +480,7 @@ EOF
                        )
    fi

-    if [ -n "${dbname}" ] && [ -n "${parsed_name}" ]; then
+    if [ -n "${DB_NAME}" ] && [ -n "${parsed_name}" ]; then
        print_debug "Parsed DBname Variant: 4 - Env, Parsed Filename"
        q_dbname_variant=4
        q_dbname_menu=$(cat <<EOF
@@ -509,7 +527,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbname=${dbname}
+                        r_dbname=${DB_NAME}
                        break
                    ;;
                    q*  )
@@ -562,7 +580,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbname=${dbname}
+                        r_dbname=${DB_NAME}
                        break
                    ;;
                    f* )
@@ -580,7 +598,7 @@ EOF
 }

 get_dbport() {
-    if [ -z "${dbport}" ] ; then
+    if [ -z "${DB_PORT}" ] ; then
        print_debug "Parsed DBPort Variant: 1 - No Env"
        q_dbport_variant=1
        q_dbport_menu=$(cat <<EOF
@@ -589,20 +607,20 @@ EOF
                        )
    fi

-    if [ -n "${dbport}" ] ; then
+    if [ -n "${DB_PORT}" ] ; then
        print_debug "Parsed DBPort Variant: 2 - Env"
        q_dbport_variant=2
        q_dbport_menu=$(cat <<EOF

    C ) Custom Entered Database Port
-    E ) Environment Variable DB_PORT: '${dbport}'
+    E ) Environment Variable DB_PORT: '${DB_PORT}'
 EOF
                        )
    fi

    cat << EOF

-What Database Port do you wish to use?
+What Database Port do you wish to use? MySQL/MariaDB typcially listens on port 3306. Postrgresql port 5432. MongoDB 27017
 ${q_dbport_menu}
    Q ) Quit

@@ -623,7 +641,7 @@ EOF
        2 )
            while true; do
                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E${cdgy}\)  : ${cwh}${coff}) " q_dbport_menu
-                case "${q_dbname_menu,,}" in
+                case "${q_dbport_menu,,}" in
                    c* )
                        counter=1
                        q_dbport=" "
@@ -637,7 +655,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbport=${dbport}
+                        r_dbport=${DB_PORT}
                        break
                    ;;
                    q*  )
@@ -651,7 +669,7 @@ EOF
 }

 get_dbuser() {
-    if [ -z "${dbuser}" ] ; then
+    if [ -z "${DB_USER}" ] ; then
        print_debug "Parsed DBUser Variant: 1 - No Env"
        q_dbuser_variant=1
        q_dbuser_menu=$(cat <<EOF
@@ -660,7 +678,7 @@ EOF
                        )
    fi

-    if [ -n "${dbuser}" ] ; then
+    if [ -n "${DB_USER}" ] ; then
        print_debug "Parsed DBUser Variant: 2 - Env"
        q_dbuser_variant=2
        q_dbuser_menu=$(cat <<EOF
@@ -706,7 +724,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbuser=${dbuser}
+                        r_dbuser=${DB_USER}
                        break
                    ;;
                    q*  )
@@ -720,7 +738,7 @@ EOF
 }

 get_dbpass() {
-    if [ -z "${dbpass}" ] ; then
+    if [ -z "${DB_PASS}" ] ; then
        print_debug "Parsed DBPass Variant: 1 - No Env"
        q_dbpass_variant=1
        q_dbpass_menu=$(cat <<EOF
@@ -729,13 +747,13 @@ EOF
                        )
    fi

-    if [ -n "${dbpass}" ] ; then
+    if [ -n "${DB_PASS}" ] ; then
        print_debug "Parsed DBPass Variant: 2 - Env"
        q_dbpass_variant=2
        q_dbpass_menu=$(cat <<EOF

    C ) Custom Entered Database Password
-    E ) Environment Variable DB_PASS: '${DB_PASS}'
+    E ) Environment Variable DB_PASS
 EOF
                        )
    fi
@@ -775,7 +793,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbpass=${dbpass}
+                        r_dbpass=${DB_PASS}
                        break
                    ;;
                    q*  )
@@ -791,7 +809,7 @@ EOF
 #### SCRIPT START
 cat << EOF

-## ${IMAGE_NAME} Restore Script Version 1.0.1
+## ${IMAGE_NAME} Restore Script
 ## Visit ${IMAGE_REPO_URL}
 ## ####################################################

@@ -811,11 +829,7 @@ print_debug "Filename to recover '${r_filename}'"

 ## Question Database Type
 if [ -n "${2}" ]; then
-    if [ ! -f "${2}" ]; then
-        get_dbtype
-    else
-        r_dbtype="${2}"
-    fi
+    r_dbtype="${2}"
 else
    get_dbtype
 fi
@@ -823,59 +837,39 @@ print_debug "Database type '${r_dbtype}'"

 ## Question Database Host
 if [ -n "${3}" ]; then
-    if [ ! -f "${3}" ]; then
-        get_dbhost
-    else
-        r_dbtype="${3}"
-    fi
+    r_dbhost="${3}"
 else
    get_dbhost
 fi
 print_debug "Database Host '${r_dbhost}'"

 ## Question Database Name
-if [ -n "${3}" ]; then
-    if [ ! -f "${3}" ]; then
-        get_dbname
-    else
-        r_dbname="${3}"
-    fi
+if [ -n "${4}" ]; then
+    r_dbname="${4}"
 else
    get_dbname
 fi
 print_debug "Database Name '${r_dbname}'"

 ## Question Database User
-if [ -n "${4}" ]; then
-    if [ ! -f "${4}" ]; then
-        get_dbuser
-    else
-        r_dbuser="${4}"
-    fi
+if [ -n "${5}" ]; then
+    r_dbuser="${5}"
 else
    get_dbuser
 fi
 print_debug "Database User '${r_dbuser}'"

 ## Question Database Password
-if [ -n "${5}" ]; then
-    if [ ! -f "${5}" ]; then
-        get_dbpass
-    else
-        r_dbpass="${5}"
-    fi
+if [ -n "${6}" ]; then
+    r_dbpass="${6}"
 else
    get_dbpass
 fi
 print_debug "Database Pass '${r_dbpass}'"

 ## Question Database Port
-if [ -n "${6}" ]; then
-    if [ ! -f "${6}" ]; then
-        get_dbport
-    else
-        r_dbport="${6}"
-    fi
+if [ -n "${7}" ]; then
+    r_dbport="${7}"
 else
    get_dbport
 fi
@@ -914,14 +908,29 @@ case "${r_dbtype}" in
        pv ${r_filename} | ${decompress_cmd}cat | mysql -u${r_dbuser} -p${r_dbpass} -P${r_dbport} -h${r_dbhost} ${r_dbname}
        exit_code=$?
    ;;
-    psql | postgres* )
+    pgsql | postgres* )
        print_info "Restoring '${r_filename}' into '${r_dbhost}'/'${r_dbname}'"
        export PGPASSWORD=${r_dbpass}
        pv ${r_filename} | ${decompress_cmd}cat | psql  -d ${r_dbname} -h ${r_dbhost} -p ${r_dbport} -U ${r_dbuser}
        exit_code=$?
    ;;
+    mongo )
+        print_info "Restoring '${r_filename}' into '${r_dbhost}'/'${r_dbname}'"
+        if [ "${ENABLE_COMPRESSION,,}" != "none" ] && [ "${ENABLE_COMPRESSION,,}" != "false" ] ; then
+            mongo_compression="--gzip"
+        fi
+        if [ -n "${r_dbuser}" ] ; then
+            mongo_user="-u=${r_dbuser}"
+        fi
+        if [ -n "${r_dbpass}" ] ; then
+            mongo_pass="-p=${r_dbpass}"
+        fi
+        mongorestore ${mongo_compression} -d=${r_dbname} -h=${r_dbhost} --port=${r_dbport} ${mongo_user} ${mongo_pass} --archive=${r_filename}
+        exit_code=$?
+    ;;
    * )
-        exit 3
+        print_info "Unable to restore DB of type '${r_dbtype}'"
+        exit_code=3
    ;;
 esac
Author	SHA1	Message	Date
dave@tiredofit.ca	68174c061f	Release 3.9.2 - See CHANGELOG.md	2023-05-10 08:19:01 -07:00
dave@tiredofit.ca	fd1d95090e	Release 3.9.1 - See CHANGELOG.md	2023-05-03 12:13:29 -07:00
Dave Conroy	7befba0d96	Update README.md	2023-04-27 08:18:26 -07:00
Dave Conroy	583253fce7	Update README.md	2023-04-26 14:43:29 -07:00
dave@tiredofit.ca	068577001e	Release 3.9.0 - See CHANGELOG.md	2023-04-26 14:32:36 -07:00
Dave Conroy	7781542816	Expand on amount of variables that can use	2023-04-24 14:54:47 -07:00
dave@tiredofit.ca	9283b5440e	Release 3.8.5 - See CHANGELOG.md	2023-04-11 15:42:30 -07:00
Dave Conroy	5e62485e7f	Merge pull request #216 from tpansino/bug/215 Set ltargets properly	2023-04-11 15:36:26 -07:00
Tom Pansino	f224571448	Set ltargets properly	2023-04-11 15:31:02 -07:00
dave@tiredofit.ca	01620fec00	Release 3.8.4 - See CHANGELOG.md	2023-04-06 12:14:22 -07:00
dave@tiredofit.ca	18a38b4f1d	Release 3.8.3 - See CHANGELOG.md	2023-03-30 14:18:55 -07:00
dave@tiredofit.ca	150f356275	Release 3.8.2 - See CHANGELOG.md	2023-03-30 14:05:17 -07:00
dave@tiredofit.ca	e838ed0027	Release 3.8.1 - See CHANGELOG.md	2023-03-30 11:04:35 -07:00
Dave Conroy	8329b4c065	Add defaults	2023-03-27 16:41:31 -07:00
dave@tiredofit.ca	dab1ac301a	Release 3.8.0 - See CHANGELOG.md	2023-03-27 15:01:10 -07:00
dave@tiredofit.ca	077201cd18	Release 3.7.7 - See CHANGELOG.md	2023-03-20 16:24:23 -07:00
Dave Conroy	eeaf59dc6f	Merge pull request #210 from codemonium/simplify-pg_isready Simplify pg_isready usage	2023-03-20 16:22:13 -07:00
Igor Artemenko	88fe0d6411	Simplify pg_isready usage The pg_isready documentation says that it does not need a correct database name or username to get the server status. In fact, incorrect values result in the server logging failed connection attempts. As a result, when we set DB_NAME to ALL, calls to the check_availability function (which uses pg_isready) cause the server to log the following error: FATAL: database "ALL" does not exist To eliminate this error, this change simplifies the pg_isready call.	2023-03-20 22:51:05 +00:00
dave@tiredofit.ca	366c4759a5	Release 3.7.6 - See CHANGELOG.md	2023-03-14 16:10:11 -07:00
Dave Conroy	37f255ec99	Merge pull request #207 from kamartem/patch-1 Typo correction	2023-03-14 16:09:08 -07:00
Dave Conroy	efa9a678c0	Merge pull request #209 from ToshY/bug/208-mysql-extra-opts-status-check Removed EXTRA_OPTS in MySQL status check	2023-03-14 16:08:53 -07:00
ToshY	68747a4aff	Removed EXTRA_OPTS in MySQL status check	2023-03-14 20:28:05 +01:00
Artem Kamyshansky	cf736278bb	Typo correction	2023-03-12 19:31:04 +03:00
dave@tiredofit.ca	1659e34fc7	Release 3.7.5 - See CHANGELOG.md	2023-03-02 07:39:58 -08:00
dave@tiredofit.ca	a8df7a2c75	Release 3.7.4 - See CHANGELOG.md	2023-02-22 08:36:46 -08:00
Dave Conroy	b5194dcce9	Merge pull request #203 from gbe0/issue/201 Fix issue #201 - 99-run_forever exec format error	2023-02-22 08:35:55 -08:00
Chris	6fb947684a	fix issue #201 - 99-run_forever exec format error	2023-02-23 00:26:54 +08:00
Dave Conroy	9287f4efeb	Update README.md	2023-01-30 11:47:15 -08:00
Dave Conroy	eeb5b5a119	Update README.md	2023-01-30 09:58:44 -08:00
Dave Conroy	a83dfd1a0b	Update Workflows	2023-01-29 18:13:20 -08:00
Dave Conroy	8fb379b51a	Update workflows	2023-01-29 16:04:15 -08:00
dave@tiredofit.ca	a90e52091d	Release 3.7.3 - See CHANGELOG.md	2022-12-20 06:47:24 -08:00
Dave Conroy	ac58b5cdf6	Merge branch 'main' of https://github.com/tiredofit/docker-db-backup	2022-12-20 06:46:46 -08:00
Dave Conroy	fcbe771793	Merge pull request #194 from alwynpan/feature/#193 #193 Make S3_KEY_ID and S3_KEY_SECRET optional for S3 Backup	2022-12-20 06:46:40 -08:00
Yao (Alwyn) Pan	168982ab53	Make S3_KEY_ID and S3_KEY_SECRET optional for S3 Backup	2022-12-20 17:51:56 +11:00
Dave Conroy	e377fcb6ae	Fix spelling mistake in Archive notice	2022-12-19 12:35:33 -08:00
dave@tiredofit.ca	50f27233a9	Release 3.7.2 - See CHANGELOG.md	2022-12-19 12:33:07 -08:00
dave@tiredofit.ca	7ccbf23af6	Release 3.7.1 - See CHANGELOG.md	2022-12-19 08:21:35 -08:00
dave@tiredofit.ca	0921971aa3	Release 3.7.0 - See CHANGELOG.md	2022-12-16 14:02:35 -08:00
dave@tiredofit.ca	fd3b9c5fa0	Release 3.6.1 - See CHANGELOG.md	2022-11-23 07:44:28 -08:00
dave@tiredofit.ca	89b6176188	Release 3.6.0 - See CHANGELOG.md	2022-11-21 12:32:33 -08:00
dave@tiredofit.ca	22e126200e	Release 3.5.6 - See CHANGELOG.md	2022-11-15 13:07:21 -08:00
dave@tiredofit.ca	3e79ca68a0	Release 3.5.5 - See CHANGELOG.md	2022-10-18 07:52:34 -07:00
Dave Conroy	bfeb07d7c0	Merge pull request #179 from greena13/bugfix/s3_backup_prefixes Bugfix: Generating S3 prefix to store new backups	2022-10-18 07:51:50 -07:00
Aleck Greenham	8a5d647de7	Merge branch 'master' of github.com:tiredofit/docker-db-backup into bugfix/s3_backup_prefixes # Conflicts: # install/assets/functions/10-db-backup	2022-10-18 07:40:33 +01:00
Aleck Greenham	4f5c04acac	Bugfix: Generating S3 prefix to store new backups	2022-10-17 18:17:48 +01:00
dave@tiredofit.ca	494f742cb0	Release 3.5.4 - See CHANGELOG.md	2022-10-13 13:59:22 -07:00
dave@tiredofit.ca	e7b9a36745	Release 3.5.3 - See CHANGELOG.md	2022-10-12 08:42:14 -07:00
dave@tiredofit.ca	28c7058f37	Release 3.5.2 - See CHANGELOG.md	2022-10-11 08:48:05 -07:00
Dave Conroy	6f15c77a0f	Merge pull request #174 from jauderho/patch-1 Update Dockerfile to use influxdb client 2.4.0	2022-10-11 08:45:47 -07:00
dave@tiredofit.ca	4e04e31d84	Release 3.5.1 - See CHANGELOG.md	2022-10-11 08:10:42 -07:00
Jauder Ho	f3fad4a893	Update Dockerfile Update influxdb client to 2.4.0.	2022-10-10 16:44:40 -07:00
dave@tiredofit.ca	69f0ca762c	Release 3.5.0 - See CHANGELOG.md	2022-10-10 12:06:38 -07:00
Dave Conroy	07d72163a0	Merge pull request #173 from tiredofit/develop	2022-10-10 12:01:34 -07:00
Dave Conroy	b31da0b785	Merge branch 'master' into develop	2022-10-10 12:01:06 -07:00
Dave Conroy	be490b3f4b	Remove url [en\|de]code functions	2022-10-10 11:53:09 -07:00
Dave Conroy	028966d0b2	Merge pull request #171 from greena13/bugfix/s3_backup_cleanup Bugfix: S3 database cleanups	2022-10-09 08:33:45 -07:00
Dave Conroy	19d8e98744	Merge pull request #169 from eoehen/feature/Add-documentation-for-blobxfer Add blobxfer documentation in readme file.	2022-10-09 08:32:59 -07:00
Aleck Greenham	25def5b6f0	Bugfix: S3 database cleanup path	2022-10-09 13:59:48 +01:00
Aleck Greenham	03b7ef9d0d	Bugfix: S3 database cleanups	2022-10-09 12:44:22 +01:00
Dave Conroy	231dd63a38	Remove quote	2022-10-08 11:57:40 -07:00
Elias Oehen	666eb81846	Add blobxfer documentation in readme file.	2022-10-08 16:57:00 +02:00
Dave Conroy	4572ab6fca	Add Azure wording to README.md	2022-10-08 07:44:05 -07:00
Dave Conroy	9ba51bcec9	Add py3-cryptography module to allow armv7 builds to finish	2022-10-08 07:19:49 -07:00
Dave Conroy	b9edbf68d3	Merge branch 'master' of https://github.com/tiredofit/docker-db-backup	2022-10-08 06:54:00 -07:00
Dave Conroy	2022158a4e	Swap around some environment checks	2022-10-07 08:33:19 -07:00
Dave Conroy	2b441f11e1	Restore old functionality for Mongo backup when not using MONGO_CUSTOM_URI	2022-10-07 08:26:54 -07:00
Dave Conroy	532a6b456b	Merge pull request #166 from eoehen/feature/Add-support-for-blobxfer Add support for blobxfer	2022-10-07 08:05:50 -07:00
Dave Conroy	a8d9a0185f	Merge pull request #165 from eoehen/feature/Improve-mssql-support Improve MSSQL Support	2022-10-07 08:04:59 -07:00
Dave Conroy	8b41f5efcf	Allow EXTRA_OPTS with MONGO_CUSTOM_URI	2022-10-07 08:03:24 -07:00
Elias Oehen	956904046d	Add support for blobxfer	2022-10-04 19:04:43 +02:00
Elias Oehen	4d7f5e9459	Add mssql docker-compose example	2022-10-04 18:37:34 +02:00
Elias Oehen	d9723823c9	Improve mssql server support	2022-10-04 18:22:20 +02:00
Elias Oehen	0067f552f1	Move mysql example to mysql folder	2022-10-04 18:21:21 +02:00
Dave Conroy	4a8f85ddf5	Add EXTRA_OPTS to Mongo string	2022-09-29 19:35:01 -07:00
Dave Conroy	6de0cc7c03	Wrap mongo_generated_uri in quotes	2022-09-29 16:06:06 -07:00
Dave Conroy	2d017e26c5	Cleanup README	2022-09-25 10:00:33 -07:00
Dave Conroy	1efb2d43a8	Set proper environment variable	2022-09-21 10:51:25 -07:00
Dave Conroy	789aa96113	Alternate way of solving Host check	2022-09-21 09:28:01 -07:00
Dave Conroy	9d8cfd69cb	Fix a couple variable issues and add silencing	2022-09-20 17:45:05 -07:00
Dave Conroy	c4dbf53ced	Final Availability check	2022-09-20 13:51:54 -07:00
Dave Conroy	8706d3a91c	Skip availability checks by default	2022-09-20 12:50:00 -07:00
Dave Conroy	73ad356ebf	Force lowercase for filenames and hostnames for filename generation	2022-09-20 12:08:53 -07:00
Dave Conroy	73c4003dc4	Fix environment variable check for Mongo	2022-09-20 12:06:13 -07:00
Dave Conroy	a377f570f1	Introduce MONGO_CUSTOM_URI support	2022-09-20 09:41:44 -07:00
dave@tiredofit.ca	b956bd817f	Release 3.4.2 - See CHANGELOG.md	2022-09-19 08:00:15 -07:00
Dave Conroy	7bda69b062	Merge pull request #158 from mark-monteiro/patch-1 Improve release notes for 3.4.1	2022-09-14 09:17:51 -07:00
Mark Monteiro	bc23b6a65e	Improve release notes for 3.4.1 Add clear migration instructions for custom script paths	2022-09-14 11:57:10 -04:00
dave@tiredofit.ca	8fb3d8315f	Release 3.4.1 - See CHANGELOG.md	2022-09-13 08:24:30 -07:00
Dave Conroy	c16133fdd0	Merge pull request #157 from ToshY/fix/readme-missing-db-dump-target updated README with missing DB_DUMP_TARGET environment variable	2022-09-12 13:09:37 -07:00
ToshY	6967fd5e56	updated README with missing DB_DUMP_TARGET environment variable	2022-09-12 21:51:14 +02:00
Dave Conroy	75acaefb64	Merge pull request #155 from ToshY/fix/readme-custom-scripts-directory updated README with correct custom scripts directory	2022-09-12 12:24:02 -07:00
ToshY	6933b0f87c	updated README with correct custom scripts directory	2022-09-12 21:17:38 +02:00
dave@tiredofit.ca	dc4ab0bfc5	Release 3.4.0 - See CHANGELOG.md	2022-09-12 07:50:55 -07:00
Dave Conroy	9ea34f5a44	Add MongoDB Atlas Support	2022-09-12 07:49:29 -07:00
Dave Conroy	1d53785e7d	Fix default port for Influx 2 DBs	2022-09-12 07:19:18 -07:00
Dave Conroy	4e0878b2ad	Merge pull request #150 from teun95/teun95-add-rsync Add --rsyncable for gzip compression	2022-09-12 07:17:41 -07:00
teun95	a98d33bfdb	Correct table formatting in README.md	2022-09-08 11:04:11 +00:00
teun95	00c851eda2	Update README.md to include GZ_RSYNCABLE	2022-09-07 19:54:41 +01:00
teun95	cd88285036	Added rsyncable option for gzip using GZ_RSYNCABLE GZ_RSYNCABLE=TRUE enables --rsyncable for gzip compression. Useful to speed up backups, reduce size of incremental backups, and allow for better deduplication.	2022-09-07 19:50:50 +01:00
dave@tiredofit.ca	428c313c7b	Release 3.3.12 - See CHANGELOG.md	2022-08-15 12:19:55 -07:00
Dave Conroy	210acb1e2a	Merge pull request #143 from arifer612/patch-1 Fix incorrect case for filesize variable	2022-08-15 12:19:12 -07:00
Arif Er	e50a8cb0ec	fix: correct case for filesize variable Post script support expects a value from a declared variable `$FILESIZE` to provide the size of the backup files. Such a variable does not exist, leading to a situation where using `"${9}"` in a custom script furnishes the checksum hash. However, earlier up in the script the file size of the backup is indeed assigned to a variable, only that is it completely in lower case: `$filesize`. This commit aims to fix that inconsistency.	2022-08-15 21:51:40 +08:00
Dave Conroy	7453852046	Release 3.3.11 - See CHANGELOG.md	2022-07-22 12:00:05 -07:00
Dave Conroy	f115a89a3c	Merge pull request #141 from khoazero123/fix_postgres_restore Fix postgres restore wrong db type	2022-07-22 11:58:57 -07:00
KhoaZero123	8b8d243944	Fix postgres restore wrong db type	2022-07-22 09:41:55 +07:00
dave@tiredofit.ca	be34ceb6ff	Release 3.3.10 - See CHANGELOG.md	2022-07-19 12:16:29 -07:00
Dave Conroy	82d6ce444b	Merge branch 'master' of https://github.com/tiredofit/docker-db-backup	2022-07-11 09:26:38 -07:00
Dave Conroy	382a188b77	Release 3.3.9 - See CHANGELOG.md	2022-07-11 09:26:35 -07:00
Dave Conroy	f458c34546	Merge pull request #140 from fdarveau/fix-read-port-number-ineractive-restore Fix reading port number in interactive restore	2022-07-11 09:25:41 -07:00
François Darveau	229db5cd03	Fix reading port number in interactive restore	2022-07-10 16:44:05 -04:00
dave@tiredofit.ca	8bb926fd20	Release 3.3.8 - See CHANGELOG.md	2022-07-09 08:59:59 -07:00
dave@tiredofit.ca	f005956c47	Release 3.3.7 - See CHANGELOG.md	2022-06-23 11:49:28 -07:00
dave@tiredofit.ca	ba20386e65	Release 3.3.6 - See CHANGELOG.md	2022-06-23 08:18:08 -07:00
dave@tiredofit.ca	12211d3b67	Release 3.3.5 - See CHANGELOG.md	2022-06-08 09:01:44 -07:00
Dave Conroy	83693d35b2	Release 3.3.4 - See CHANGELOG.md	2022-06-03 05:10:53 -07:00
Dave Conroy	52b726c821	Merge pull request #132 from rozdzynski/master Unary operator fix	2022-06-03 05:09:27 -07:00
rozdzynski	5c43b3c907	unary operator fix	2022-06-03 14:02:42 +02:00
dave@tiredofit.ca	005e7f6e47	Release 3.3.3 - See CHANGELOG.md	2022-05-24 08:26:45 -07:00
Dave Conroy	7d7cb9587d	Release 3.3.2 - See CHANGELOG.md	2022-05-02 22:28:08 -07:00
Dave Conroy	d1713fe3f0	Release 3.3.1 - See CHANGELOG.md	2022-04-30 22:31:34 -07:00
Dave Conroy	d1e98d9c4b	Release 3.3.0 - See CHANGELOG.md	2022-04-30 03:23:45 -07:00
Dave Conroy	0920b671cb	Release 3.2.6 - See CHANGELOG.md	2022-04-25 10:29:45 -07:00
Dave Conroy	28ed6c3bb8	Release 3.2.5 - See CHANGELOG.md	2022-04-23 14:11:29 -07:00
Dave Conroy	c1bdf26598	Release 3.2.4 - See CHANGELOG.md	2022-04-21 16:04:43 -07:00
Dave Conroy	5a4cac2cee	Release 3.2.3 - See CHANGELOG.md	2022-04-21 15:46:27 -07:00
Dave Conroy	c04eec7661	Add space after compress_cmd	2022-04-21 14:19:09 -07:00
Dave Conroy	32f1959a07	Merge pull request #120 from joergmschulz/patch-1 small typo / exiting instead of exitting	2022-04-21 14:18:43 -07:00
joergmschulz	d384d5a529	small typo / exiting instead of exitting	2022-04-21 23:16:02 +02:00
Dave Conroy	56ab68dd71	Release 3.2.2 - See CHANGELOG.md	2022-04-21 12:14:17 -07:00
Dave Conroy	9a1a5efbd9	Do a different DB Ready check for Influx 1 vs 2	2022-04-21 12:12:57 -07:00
Dave Conroy	df5532c128	Fix blank database size when compression type=NONE	2022-04-21 12:08:51 -07:00
Dave Conroy	2ecd313778	Change database variables around	2022-04-21 12:08:27 -07:00
Dave Conroy	55cfe5ab02	Release 3.2.1 - See CHANGELOG.md	2022-04-03 10:28:07 -07:00
Dave Conroy	ae2e2c38e2	Sanitize DB_HOST for URLs	2022-04-02 07:37:34 -07:00
Dave Conroy	c23d7991fe	Release 3.2.0 - See CHANGELOG.md	2022-04-01 18:41:58 -07:00
Dave Conroy	3f58cfd284	Release 3.1.3 - See CHANGELOG.md	2022-03-30 10:46:16 -07:00
Dave Conroy	2d01f5e692	Fix for MARIADB not sending DB name for post script	2022-03-30 10:45:27 -07:00
Dave Conroy	dbd0a03b0d	SPLIT_DB is supposed to be TRUE	2022-03-30 10:43:22 -07:00
Dave Conroy	6527f4ff63	Add sanity checks for Post scripts to be executible	2022-03-30 10:37:58 -07:00
Dave Conroy	d843d21a1b	Release 3.1.2 - See CHANGELOG.md	2022-03-29 08:09:36 -07:00
Dave Conroy	24ed769429	Release 3.1.1 - See CHANGELOG.md	2022-03-28 10:29:00 -07:00
Dave Conroy	cbd87a5ede	Update README.md	2022-03-23 19:16:51 -07:00
Dave Conroy	13214665c9	Release 3.1.0 - See CHANGELOG.md	2022-03-23 16:21:12 -07:00
Dave Conroy	2e71f617a1	Merge pull request #107 from piemonkey/mongo-restore Add Mongo support to restore script	2022-03-23 12:24:43 -07:00
Dave Conroy	fbe9dde4a1	Release 3.0.16 - See CHANGELOG.md	2022-03-23 07:57:28 -07:00
Dave Conroy	eb2a18672b	Release 3.0.15 - See CHANGELOG.md	2022-03-22 18:27:57 -07:00
Dave Conroy	5f784ed156	Tweak Example	2022-03-22 09:57:28 -07:00
Dave Conroy	d9a4690ea2	Release 3.0.14 - See CHANGELOG.md	2022-03-22 07:52:15 -07:00
Rich	e7eb88c32a	Give feedback if restore script doesn't support db type	2022-03-22 09:12:34 +01:00
Rich	52dc510b89	Add auto restore support for mongodb	2022-03-22 09:12:16 +01:00
Rich	06677dbc8b	Fix typo setting dbhost in restore script	2022-03-22 09:12:05 +01:00
Rich	e0dd2bc91b	Set db type from env vars correctly during restore	2022-03-22 09:11:54 +01:00
Dave Conroy	baba842373	Release 3.0.13 - See CHANGELOG.md	2022-03-21 16:26:45 -07:00
Dave Conroy	108938c17a	Release 3.0.12 - See CHANGELOG.md	2022-03-21 13:51:01 -07:00