Release 3-3.12.2 - See CHANGELOG.md

Merge pull request #303 from alwynpan/feature/remove-deprecation-warning
#298 Use pip to install awscli to remove the deprecation warning
2025-12-21 21:33:28 +01:00 · 2023-12-03 22:05:28 -08:00 · 2023-12-03 22:03:40 -08:00 · 2023-12-04 15:32:42 +11:00 · 2023-11-30 07:21:58 -08:00 · 2023-10-29 18:56:11 -07:00
19 changed files with 2179 additions and 1053 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,14 @@
-### 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_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,10 @@ 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_arm64.yml@main
+    secrets: inherit
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/84
+++ b/84
@@ -1,8 +1,15 @@
-FROM docker.io/tiredofit/alpine:3.15
+ARG DISTRO=alpine
+ARG DISTRO_VARIANT=edge
+
+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 INFLUX_VERSION=1.8.0 \
+    INFLUX2_VERSION=2.4.0 \
+    MSODBC_VERSION=18.3.2.1-1 \
+    MSSQL_VERSION=18.3.1.1-1 \
+    AWS_CLI_VERSION=1.31.5 \
    CONTAINER_ENABLE_MESSAGING=FALSE \
    CONTAINER_ENABLE_MONITORING=TRUE \
    CONTAINER_PROCESS_RUNAWAY_PROTECTOR=FALSE \
@@ -10,43 +17,66 @@ 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 \
+               cargo \
               git \
+               go \
               libarchive-dev \
+               openssl-dev \
+               libffi-dev \
+               python3-dev \
+               py3-pip \
               xz-dev \
               && \
    \
-    apk add --no-cache -t .db-backup-run-deps \
-               aws-cli \
+    package install .db-backup-run-deps \
               bzip2 \
-               influxdb \
+               groff \
               libarchive \
               mariadb-client \
               mariadb-connector-c \
               mongodb-tools \
-               libressl \
+               openssl \
               pigz \
-               postgresql \
-               postgresql-client \
+               postgresql16 \
+               postgresql16-client \
               pv \
+               py3-botocore \
+               py3-colorama \
+               py3-cryptography \
+               py3-docutils \
+               py3-jmespath \
+               py3-rsa \
+               py3-setuptools \
+               py3-s3transfer \
+               py3-yaml \
+               python3 \
               redis \
               sqlite \
               xz \
+               zip \
               zstd \
               && \
    \
-    cd /usr/src && \
-    \
-    apkArch="$(apk --print-arch)"; \
+    apkArch="$(uname -m)"; \
    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 ; mssql_arch=amd64; influx2=true ; influx_arch=amd64; ;; \
+        arm64 ) mssql=true ; mssql_arch=amd64; influx2=true ; influx_arch=arm64 ;; \
+        *) sleep 0.1 ;; \
    esac; \
+    \
+    if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; ls -l ; echo y | apk add --allow-untrusted msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; else echo >&2 "Detected non x86_64 or ARM64 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 ; \
+    pip3 install --break-system-packages awscli==${AWS_CLI_VERSION} && \
+    clone_git_repo https://github.com/influxdata/influxdb "${INFLUX_VERSION}" && \
+    go build -o /usr/sbin/influxd ./cmd/influxd && \
+    strip /usr/sbin/influxd && \
    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 +93,17 @@ 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 --break-system-packages blobxfer && \
+    \
+    package remove .db-backup-build-deps && \
+    package cleanup && \
+    rm -rf \
+            /*.apk \
+            /etc/logrotate.d/* \
+            /root/.cache \
+            /root/go \
+            /tmp/* \
+            /usr/src/*

-### S6 Setup
-ADD install  /
+
+COPY install  /
--- a/README.md
+++ b/README.md
@@ -1,31 +1,33 @@
 # 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)
 [![Paypal Donate](https://img.shields.io/badge/donate-paypal-00457c.svg?logo=paypal&style=flat-square)](https://www.paypal.me/tiredofit)

-* * *
+---
+
 ## About

 This will build a container for backing up multiple types of DB Servers

-Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers.
+Currently backs up CouchDB, InfluxDB, MySQL, Microsoft SQL, MongoDB, Postgres, Redis servers.

-* dump to local filesystem or backup to S3 Compatible services
-* select database user and password
-* backup all databases
-* 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)
-* connect to any container running on the same system
-* Script to perform restores
-* Zabbix Monitoring capabilities
-* select how often to run a dump
-* select when to start the first dump, whether time of day or relative to container start time
-* Execute script after backup for monitoring/alerting purposes
+- dump to local filesystem or backup to S3 Compatible services, and Azure.
+- select database user and password
+- backup all databases, single, or multiple databases
+- backup all to separate 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)
+- connect to any container running on the same system
+- Script to perform restores
+- Zabbix Monitoring capabilities
+- select how often to run a dump
+- select when to start the first dump, whether time of day or relative to container start time
+- Execute script after backup for monitoring/alerting purposes

 ## Maintainer

@@ -33,10 +35,10 @@ Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers.

 ## Table of Contents

+- [github.com/tiredofit/docker-db-backup](#githubcomtiredofitdocker-db-backup)
  - [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 +46,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,18 +72,26 @@ 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
+
+- You must have a working connection to one of the supported DB Servers and appropriate credentials

 ## Installation

 ### Build from Source
+
 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)
+
+```bash
+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,33 +100,37 @@ 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/tiredofit/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)`
+
+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 architectures, type `docker manifest (image):(tag)`

 ## Configuration

 ### Quick Start

-* The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). See the examples folder for a working [docker-compose.yml](examples/docker-compose.yml) that can be modified for development or production use.
+- The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). See the examples folder for a working [docker-compose.yml](examples/docker-compose.yml) that can be modified for development or production use.
+
+- 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

-* 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 |
+| `/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 handled 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:

@@ -122,48 +141,75 @@ 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`    |
+| ----------------------- | -------------------------------------------------------------------------------------------------------------------------------- | --------------- |
+| `BACKUP_LOCATION`       | Backup to `FILESYSTEM`, `blobxfer` 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`         |
+| `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/PGSQL Only - Optional) Authentication Database                                                                                                                                 |         |         |
+| `DB_TYPE`          | Type of DB Server to backup `couch` `influx` `mysql` `mssql` `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 separating with commas eg `db1,db2`                                           |         | x       |
+| `DB_NAME_EXCLUDE`  | If using `ALL` - use this as to exclude databases separated 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 override 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_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_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_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 frequency 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`            | Numerical 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 and database enumeration command, add them here e.g. `--extra-command`     |                           |         |
+| `EXTRA_DUMP_OPTS`              | If you need to pass extra arguments to the backup command only, add them here e.g. `--extra-command`                         |                           |         |
+| `EXTRA_ENUMERATION_OPTS`       | If you need to pass extra arguments to the database enumeration command only, 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,39 +217,59 @@ 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 file share 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.

-``bash
+`bash
 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
 - What type of DB Backup
 - What Host to restore to
@@ -223,9 +289,43 @@ 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

-````bash
+| 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
 ##!/bin/bash

@@ -240,36 +340,46 @@ $ cat post-script.sh
 # #### $8=BACKUP FILENAME (Filename)
 # #### $9=BACKUP FILESIZE
 # #### $10=HASH (If CHECKSUM enabled)
+# #### $11=MOVE_EXIT_CODE

 echo "${1} ${2} Backup Completed on ${3} for ${4} on ${5} ending ${6} for a duration of ${7} seconds. Filename: ${8} Size: ${9} bytes MD5: ${10}"
-````
+```

      ## script EXIT_CODE DB_TYPE DB_HOST DB_NAME STARTEPOCH FINISHEPOCH DURATIONEPOCH BACKUP_FILENAME FILESIZE CHECKSUMVALUE
-      ${f} "${exit_code}" "${dbtype}" "${dbhost}" "${dbname}" "${backup_start_timme}" "${backup_finish_time}" "${backup_total_time}" "${target}" "${FILESIZE}" "${checksum_value}"
-
+      ${f} "${exit_code}" "${dbtype}" "${dbhost}" "${dbname}" "${backup_start_timme}" "${backup_finish_time}" "${backup_total_time}" "${target}" "${FILESIZE}" "${checksum_value}" "${move_exit_code}

 Outputs the following on the console:

-`0 mysql Backup Completed on example-db for example on 1647370800 ending 1647370920 for a duration of 120 seconds. Filename: mysql_example_example-db_202200315-000000.sql.bz2 Size: 7795 bytes Hash: 952fbaafa30437494fdf3989a662cd40`
+`0 mysql Backup Completed on example-db for example on 1647370800 ending 1647370920 for a duration of 120 seconds. Filename: mysql_example_example-db_202200315-000000.sql.bz2 Size: 7795 bytes Hash: 952fbaafa30437494fdf3989a662cd40 0`

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

+You must make your scripts executable 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.

 ### Feature Requests
+
 - Feel free to submit a feature request, however there is no guarantee that it will be added, or at what timeline.
 - Consider [sponsoring me](https://github.com/sponsors/tiredofit) regarding development of features.

 ### Updates
+
 - Best effort to track upstream changes, More priority if I am actively using the image in a production environment.
 - Consider [sponsoring me](https://github.com/sponsors/tiredofit) for up to date releases.

 ## License
+
 MIT. See [LICENSE](LICENSE) for more details.
--- 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,53 @@
+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:
+      - TIMEZONE=America/Vancouver
+      - CONTAINER_ENABLE_MONITORING=FALSE
+      # - 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
+
+    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"}
+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,34 +5,14 @@ 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
-fi
-
-case "${1,,}" in
-    "now" | "manual" )
-        DB_DUMP_BEGIN=+0
-        manual=TRUE
-    ;;
-    * )
+    print_debug "Detected Manual Mode"
+else
    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")

@@ -50,19 +30,11 @@ case "${1,,}" in
    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.

@@ -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 | sort -z | 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,8 +130,8 @@ EOF
                        )
    fi

-    if [ -z "${dbhost}" ] && [ -n "${parsed_host}" ]; then
-        print_debug "Parsed DBHostpho Variant: 3 - No Env, Parsed Filename"
+    if [ -z "${DB_HOST}" ] && [ -n "${parsed_host}" ]; then
+        print_debug "Parsed DBHost 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

@@ -329,12 +335,16 @@ EOF
    case "${q_dbtype_variant}" in
        1 )
            while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}M${cdgy}\) | \(${cwh}P${cdgy}\) : ${cwh}${coff}) " q_dbtype
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}M${cdgy}\) \| \(${cwh}O${cdgy}\) \| \(${cwh}P${cdgy}\) : ${cwh}${coff}) " q_dbtype
                case "${q_dbtype,,}" in
                    m* )
                        r_dbtype=mysql
                        break
                    ;;
+                    o* )
+                        r_dbtype=mongo
+                        break
+                    ;;
                    p* )
                        r_dbtype=postgresql
                        break
@@ -348,16 +358,20 @@ EOF
        ;;
        2 )
            while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}E${cdgy}\) \| \(${cwh}M${cdgy}\) \| \(${cwh}P${cdgy}\) : ${cwh}${coff}) " q_dbtype
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}E${cdgy}\) \| \(${cwh}M${cdgy}\) \| \(${cwh}O${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
@@ -371,7 +385,7 @@ EOF
        ;;
        3 )
            while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}F${cdgy}\) \| \(${cwh}M${cdgy}\) \| \(${cwh}P${cdgy}\) : ${cwh}${coff}) " q_dbtype
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}F${cdgy}\) \| \(${cwh}M${cdgy}\) \| \(${cwh}O${cdgy}\) \| \(${cwh}P${cdgy}\) : ${cwh}${coff}) " q_dbtype
                case "${q_dbtype,,}" in
                    f* | "" )
                        r_dbtype=${p_dbtype}
@@ -381,6 +395,10 @@ EOF
                        r_dbtype=mysql
                        break
                    ;;
+                    o* )
+                        r_dbtype=mongo
+                        break
+                    ;;
                    p* )
                        r_dbtype=postgresql
                        break
@@ -395,10 +413,10 @@ EOF

        4 )
            while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}E${cdgy}\) \| \(${cwh}F${cdgy}\) \| \(${cwh}M${cdgy}\) \| \(${cwh}P${cdgy}\) : ${cwh}${coff}) " q_dbtype
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}E${cdgy}\) \| \(${cwh}F${cdgy}\) \| \(${cwh}M${cdgy}\) \| \(${cwh}O${cdgy}\) \| \(${cwh}P${cdgy}\) : ${cwh}${coff}) " q_dbtype
                case "${q_dbtype,,}" in
                    e* | "" )
-                        r_dbtype=${dbtype}
+                        r_dbtype=${DB_TYPE}
                        break
                    ;;
                    f* )
@@ -409,6 +427,10 @@ EOF
                        r_dbtype=mysql
                        break
                    ;;
+                    o* )
+                        r_dbtype=mongo
+                        break
+                    ;;
                    p* )
                        r_dbtype=postgresql
                        break
@@ -431,7 +453,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 +462,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 +473,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 +484,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 +531,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbname=${dbname}
+                        r_dbname=${DB_NAME}
                        break
                    ;;
                    q*  )
@@ -562,7 +584,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbname=${dbname}
+                        r_dbname=${DB_NAME}
                        break
                    ;;
                    f* )
@@ -580,7 +602,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 +611,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 +645,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 +659,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbport=${dbport}
+                        r_dbport=${DB_PORT}
                        break
                    ;;
                    q*  )
@@ -651,7 +673,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 +682,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 +728,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbuser=${dbuser}
+                        r_dbuser=${DB_USER}
                        break
                    ;;
                    q*  )
@@ -720,7 +742,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 +751,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 +797,7 @@ EOF
                        break
                    ;;
                    e* | "" )
-                        r_dbpass=${dbpass}
+                        r_dbpass=${DB_PASS}
                        break
                    ;;
                    q*  )
@@ -791,7 +813,7 @@ EOF
 #### SCRIPT START
 cat << EOF

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

@@ -811,11 +833,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
 else
    get_dbtype
 fi
@@ -823,59 +841,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 +912,57 @@ 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 )
+        cat << EOF
+
+Do you wish to drop any existing data before restoring?
+    Y ) Yes
+    N ) No
+    Q ) Quit
+
+EOF
+
+        echo -e "${coff}"
+        read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}Y${cdgy}\) \| \(${cwh}N${cdgy}\) \| \(${cwh}Q${cdgy}\)  : ${cwh}${coff})" q_menu_mongo_dropdb
+        case "${q_menu_mongo_dropdb,,}" in
+            "y" | "yes" | * )
+                mongo_dropdb="--drop"
+            ;;
+            "n" | "update" )
+                unset mongo_dropdb
+            ;;
+            "q" | "exit" )
+                print_info "Quitting Script"
+                exit 1
+            ;;
+        esac
+
+        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
+        if [ -n "${DB_AUTH}" ] ; then
+            mongo_auth_database="--authenticationDatabase=${DB_AUTH}"
+        fi
+
+        mongorestore ${mongo_compression} -d=${r_dbname} -h=${r_dbhost} --port=${r_dbport} ${mongo_dropdb} ${mongo_user} ${mongo_pass} --archive=${r_filename} ${mongo_auth_database}
+        exit_code=$?
+    ;;
    * )
-        exit 3
+        print_info "Unable to restore DB of type '${r_dbtype}'"
+        exit_code=3
    ;;
 esac