Release 2.4.0 - See CHANGELOG.md

#51 Fix backup of multiple InfluxDB databases failure

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [tiredofit]

CHANGELOG.md

@@ -1,3 +1,58 @@
+## 2.4.0 2020-12-07 <dave at tiredofit dot ca>
+
+   ### Added
+      - Switch back to packges for Postgresql (now 13.1)
+
+
+## 2.3.2 2020-11-14 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Reapply S6-Overlay into filesystem as Postgresql build is removing S6 files due to edge containing S6 overlay
+
+
+## 2.3.1 2020-11-11 <bambi73@github>
+
+   ### Fixed
+      - Multiple Influx DB's not being backed up correctly
+
+## 2.3.0 2020-10-15 <dave at tiredofit dot ca>
+
+   ### Added
+      - Microsoft SQL Server support (experimental)
+
+   ### Changed
+      - Compiled Postgresql 13 from source to backup psql/13 hosts
+
+## 2.2.2 2020-09-22 <tpansino@github>
+
+   ### Fixed
+      - Patch for 2.2.0 release fixing Docker Secrets Support. Was skipping password check.
+
+## 2.2.1 2020-09-17 <alwynpan@github>
+
+   ### Fixed
+      - Ondemand/Manual backup with `backup-now` was throwing errors not being able to find a proper date
+
+## 2.2.0 2020-09-14 <alwynpan@github>
+
+   ### Fixed
+      - Allow to use MariaDB and MongoDBs with no username and password while still allowing Docker Secrets
+      - Changed source of Alpine package repositories
+
+
+## 2.1.1 2020-09-01 <zicklag@github>
+
+   ### Fixed
+      - Add eval to POST_SCRIPT execution
+
+
+## 2.1.0 2020-08-29 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add Exit Code variable to be used for custom scripts - See README.md for placement
+      - Add POST_SCRIPT environment variable to execute command instead of relying on custom script
+
+
 ## 2.0.0 2020-06-17 <dave at tiredofit dot ca>
 
    ### Added

Dockerfile

@@ -1,15 +1,15 @@
 FROM tiredofit/alpine:edge
-LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
 
 ### Set Environment Variables
-ENV ENABLE_CRON=FALSE \
+ENV MSSQL_VERSION=17.5.2.1-1 \
+    ENABLE_CRON=FALSE \
     ENABLE_SMTP=FALSE \
     ENABLE_ZABBIX=TRUE \
     ZABBIX_HOSTNAME=db-backup
 
-### Dependencies
+    ### Dependencies
 RUN set -ex && \
-    echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
     apk update && \
     apk upgrade && \
     apk add -t .db-backup-build-deps \
@@ -19,7 +19,7 @@ RUN set -ex && \
                xz-dev \
                && \
     \
-    apk add -t .db-backup-run-deps \
+    apk add --no-cache -t .db-backup-run-deps \
       	       bzip2 \
                influxdb \
                mariadb-client \
@@ -33,10 +33,15 @@ RUN set -ex && \
                zstd \
                && \
     \
-    apk add \
+    apk add --no-cache \
                pixz@testing \
                && \
     \
+    cd /usr/src && \
+    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 && \
+    \
     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 && \

README.md

@@ -1,16 +1,15 @@
 # hub.docker.com/r/tiredofit/db-backup
 
-
 [![Build Status](https://img.shields.io/docker/build/tiredofit/db-backup.svg)](https://hub.docker.com/r/tiredofit/db-backup)
 [![Docker Pulls](https://img.shields.io/docker/pulls/tiredofit/db-backup.svg)](https://hub.docker.com/r/tiredofit/db-backup)
 [![Docker Stars](https://img.shields.io/docker/stars/tiredofit/db-backup.svg)](https://hub.docker.com/r/tiredofit/db-backup)
 [![Docker Layers](https://images.microbadger.com/badges/image/tiredofit/db-backup.svg)](https://microbadger.com/images/tiredofit/db-backup)
 
-# Introduction
+## Introduction
 
 This will build a container for backing up multiple type of DB Servers
 
-Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis, Rethink servers.
+Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers.
 
 * dump to local filesystem or backup to S3 Compatible services
 * select database user and password
@@ -27,40 +26,50 @@ Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis, Rethink s
 
 [Changelog](CHANGELOG.md)
 
-# Authors
+## Authors
 
 - [Dave Conroy](https://github.com/tiredofit)
 
-# Table of Contents
+## Table of Contents
 
-- [Introduction](#introduction)
+- [hub.docker.com/r/tiredofit/db-backup](#hubdockercomrtiredofitdb-backup)
-    - [Changelog](CHANGELOG.md)
+  - [Introduction](#introduction)
-- [Prerequisites](#prerequisites)
+  - [Authors](#authors)
-- [Installation](#installation)
+  - [Table of Contents](#table-of-contents)
-- [Quick Start](#quick-start)
+  - [Prerequisites](#prerequisites)
-- [Configuration](#configuration)
+  - [Installation](#installation)
-    - [Data Volumes](#data-volumes)
+    - [Quick Start](#quick-start)
-    - [Environment Variables](#environmentvariables)
+  - [Configuration](#configuration)
-- [Maintenance](#maintenance)
+    - [Data-Volumes](#data-volumes)
+    - [Environment Variables](#environment-variables)
+  - [Maintenance](#maintenance)
     - [Shell Access](#shell-access)
       - [Custom Scripts](#custom-scripts)
+  - [Example Post Script](#example-post-script)
+  - [$1=EXIT_CODE (After running backup routine)](#1exit_code-after-running-backup-routine)
+  - [$2=DB_TYPE (Type of Backup)](#2db_type-type-of-backup)
+  - [$3=DB_HOST (Backup Host)](#3db_host-backup-host)
+  - [#4=DB_NAME (Name of Database backed up](#4db_name-name-of-database-backed-up)
+  - [$5=DATE (Date of Backup)](#5date-date-of-backup)
+  - [$6=TIME (Time of Backup)](#6time-time-of-backup)
+  - [$7=BACKUP_FILENAME (Filename of Backup)](#7backup_filename-filename-of-backup)
+  - [$8=FILESIZE (Filesize of backup)](#8filesize-filesize-of-backup)
+  - [$9=MD5_RESULT (MD5Sum if enabled)](#9md5_result-md5sum-if-enabled)
 
-# Prerequisites
+## Prerequisites
 
 You must have a working DB server or container available for this to work properly, it does not provide server functionality!
 
-
+## Installation
-# Installation
 
 Automated builds of the image are available on [Docker Hub](https://hub.docker.com/r/tiredofit/db-backup) and is the recommended
 method of installation.
 
-
 ```bash
 docker pull tiredofit/db-backup:latest
 ```
 
-# Quick Start
+### 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.
 
@@ -69,68 +78,65 @@ docker pull tiredofit/db-backup:latest
 
 > **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.
 
-# Configuration
+## Configuration
 
-## Data-Volumes
+### Data-Volumes
 
 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/custom-scripts` | *Optional* Put custom scripts in this directory to execute after backup operations |
 
-
+### Environment Variables
-## Environment Variables
-
-*If you are trying to backup a database that doesn't have a user or a password (you should!) make sure you set `CONTAINER_ENABLE_DOCKER_SECRETS=FALSE`*
 
 Along with the Environment Variables from the [Base image](https://hub.docker.com/r/tiredofit/alpine), below is the complete list of available options that can be used to customize your installation.
 
-
 | Parameter              | Description                                                                                                                                                                                        |
-|-----------|-------------|
+| ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `BACKUP_LOCATION` | Backup to `FILESYSTEM` or `S3` compatible services like S3, Minio, Wasabi - Default `FILESYSTEM`
+| `BACKUP_LOCATION`      | Backup to `FILESYSTEM` or `S3` compatible services like S3, Minio, Wasabi - Default `FILESYSTEM`                                                                                                   |
-| `COMPRESSION` | Use either Gzip `GZ`, Bzip2 `BZ`, XZip `XZ`, ZSTD `ZSTD` or none `NONE` - Default `GZ`
+| `COMPRESSION`          | Use either Gzip `GZ`, Bzip2 `BZ`, XZip `XZ`, ZSTD `ZSTD` or none `NONE` - Default `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` - Default `3`                                                           |
-| `DB_TYPE` | Type of DB Server to backup `couch` `influx` `mysql` `pgsql` `mongo` `redis` `rethink`
+| `DB_TYPE`              | Type of DB Server to backup `couch` `influx` `mysql` `pgsql` `mongo` `redis`                                                                                                                       |
-| `DB_HOST` | Server Hostname e.g. `mariadb`
+| `DB_HOST`              | Server Hostname e.g. `mariadb`                                                                                                                                                                     |
-| `DB_NAME` | Schema Name e.g. `database`
+| `DB_NAME`              | Schema Name e.g. `database`                                                                                                                                                                        |
-| `DB_USER` | username for the database - use `root` to backup all MySQL of them.
+| `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_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
+| `DB_PORT`              | (optional) Set port to connect to DB_HOST. Defaults are provided                                                                                                                                   |
-| `DB_DUMP_FREQ` | How often to do a dump, in minutes. Defaults to 1440 minutes, or once per day.
+| `DB_DUMP_FREQ`         | How often to do a dump, in minutes. Defaults to 1440 minutes, or once per day.                                                                                                                     |
-| `DB_DUMP_BEGIN` | What time to do the first dump. Defaults to immediate. Must be in one of two formats
+| `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`
+|                        | 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
+|                        | 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.
+| `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. |
-| `DEBUG_MODE` | If set to `true`, print copious shell script messages to the container log. Otherwise only basic messages are printed.
+| `DEBUG_MODE`           | If set to `true`, print copious shell script messages to the container log. Otherwise only basic messages are printed.                                                                             |
-| `EXTRA_OPTS` | If you need to pass extra arguments to the backup command, add them here e.g. "--extra-command"
+| `EXTRA_OPTS`           | If you need to pass extra arguments to the backup command, add them here e.g. "--extra-command"                                                                                                    |
-| `MD5` | Generate MD5 Sum in Directory, `TRUE` or `FALSE` - Default `TRUE`
+| `MD5`                  | Generate MD5 Sum in Directory, `TRUE` or `FALSE` - Default `TRUE`                                                                                                                                  |
 | `PARALLEL_COMPRESSION` | Use multiple cores when compressing backups `TRUE` or `FALSE` - Default `TRUE`                                                                                                                     |
+| `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. - Default `FALSE`                                                           |
 
+When using compression with MongoDB, only `GZ` compression is possible.
 
 **Backing Up to S3 Compatible Services**
 
 If `BACKUP_LOCATION` = `S3` then the following options are used.
 
 | Parameter       | Description                                                                             |
-|-----------|-------------|
+| --------------- | --------------------------------------------------------------------------------------- |
 | `S3_BUCKET`     | S3 Bucket name e.g. 'mybucket'                                                          |
-| `S3_HOSTNAME` | Hostname of S3 Server e.g "s3.amazonaws.com" - You can also include a port if necessary
+| `S3_HOSTNAME`   | Hostname of S3 Server e.g "s3.amazonaws.com" - You can also include a port if necessary |
 | `S3_KEY_ID`     | S3 Key ID                                                                               |
 | `S3_KEY_SECRET` | S3 Key Secret                                                                           |
 | `S3_PATH`       | S3 Pathname to save to e.g. '`backup`'                                                  |
 | `S3_PROTOCOL`   | Use either `http` or `https` to access service - Default `https`                        |
-| `S3_URI_STYLE` | Choose either `VIRTUALHOST` or `PATH` style - Default `VIRTUALHOST`
+| `S3_URI_STYLE`  | Choose either `VIRTUALHOST` or `PATH` style - Default `VIRTUALHOST`                     |
 
 ## Maintenance
 
 Manual Backups can be performed by entering the container and typing `backup-now`
 
-
+### Shell Access
-#### Shell Access
 
 For debugging and maintenance purposes you may want access the containers shell.
 
@@ -147,19 +153,21 @@ $ cat post-script.sh
 ##!/bin/bash
 
 ## Example Post Script
-## $1=DB_TYPE (Type of Backup)
+## $1=EXIT_CODE (After running backup routine)
-## $2=DB_HOST (Backup Host)
+## $2=DB_TYPE (Type of Backup)
-## #3=DB_NAME (Name of Database backed up
+## $3=DB_HOST (Backup Host)
-## $4=DATE (Date of Backup)
+## #4=DB_NAME (Name of Database backed up
-## $5=TIME (Time of Backup)
+## $5=DATE (Date of Backup)
-## $6=BACKUP_FILENAME (Filename of Backup)
+## $6=TIME (Time of Backup)
-## $7=FILESIZE (Filesize of backup)
+## $7=BACKUP_FILENAME (Filename of Backup)
-## $8=MD5_RESULT (MD5Sum if enabled)
+## $8=FILESIZE (Filesize of backup)
+## $9=MD5_RESULT (MD5Sum if enabled)
 
-echo "${1} Backup Completed on ${2} for ${3} on ${4} ${5}. Filename: ${6} Size: ${7} bytes MD5: ${8}"
+echo "${1} ${2} Backup Completed on ${3} for ${4} on ${5} ${6}. Filename: ${7} Size: ${8} bytes MD5: ${9}"
 ````
+
 Outputs the following on the console:
 
-`mysql Backup Completed on example-db for example on 2020-04-22 05:19:10. Filename: mysql_example_example-db_20200422-051910.sql.bz2 Size: 7795 bytes MD5: 952fbaafa30437494fdf3989a662cd40`
+`0 mysql Backup Completed on example-db for example on 2020-04-22 05:19:10. Filename: mysql_example_example-db_20200422-051910.sql.bz2 Size: 7795 bytes MD5: 952fbaafa30437494fdf3989a662cd40`
 
 If you wish to change the size value from bytes to megabytes set environment variable `SIZE_VALUE=megabytes`

examples/post-script.sh

@@ -1,13 +1,14 @@
 ##!/bin/bash
 
 ## Example Post Script
-## $1=DB_TYPE (Type of Backup)
+## $1=EXIT_CODE (After running backup routine)
-## $2=DB_HOST (Backup Host)
+## $2=DB_TYPE (Type of Backup)
-## #3=DB_NAME (Name of Database backed up
+## $3=DB_HOST (Backup Host)
-## $4=DATE (Date of Backup)
+## #4=DB_NAME (Name of Database backed up
-## $5=TIME (Time of Backup)
+## $5=DATE (Date of Backup)
-## $6=BACKUP_FILENAME (Filename of Backup)
+## $6=TIME (Time of Backup)
-## $7=FILESIZE (Filesize of backup)
+## $7=BACKUP_FILENAME (Filename of Backup)
-## $8=MD5_RESULT (MD5Sum if enabled)
+## $8=FILESIZE (Filesize of backup)
+## $9=MD5_RESULT (MD5Sum if enabled)
 
-echo "${1} Backup Completed on ${2} for ${3} on ${4} ${5}. Filename: ${6} Size: ${7} bytes MD5: ${8}"
+echo "${1} ${2} Backup Completed on ${3} for ${4} on ${5} ${6}. Filename: ${7} Size: ${8} bytes MD5: ${9}"

install/etc/services.available/10-db-backup/run

@@ -14,8 +14,48 @@ fi
 sanity_var DB_TYPE "Database Type"
 sanity_var DB_HOST "Database Host"
 
-file_env 'DB_USER'
+### Set the Database Type
-file_env 'DB_PASS'
+dbtype=${DB_TYPE}
+
+case "$dbtype" in
+    "couch" | "couchdb" | "COUCH" | "COUCHDB"  )
+        dbtype=couch
+        dbport=${DB_PORT:-5984}
+        file_env 'DB_USER'
+        file_env 'DB_PASS'
+    ;;
+    "influx" | "influxdb" | "INFLUX" | "INFLUXDB"  )
+        dbtype=influx
+        dbport=${DB_PORT:-8088}
+        file_env 'DB_USER'
+        file_env 'DB_PASS'
+    ;;
+    "mongo" | "mongodb" | "MONGO" | "MONGODB" )
+        dbtype=mongo
+        dbport=${DB_PORT:-27017}
+        [[ ( -n "${DB_USER}" ) || ( -n "${DB_USER_FILE}" ) ]] && file_env 'DB_USER'
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
+    ;;
+    "mysql" | "MYSQL" | "mariadb" | "MARIADB")
+        dbtype=mysql
+        dbport=${DB_PORT:-3306}
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
+    ;;
+    "mssql" | "MSSQL" | "microsoftsql" | "MICROSOFTSQL")
+        dbtype=mssql
+        dbport=${DB_PORT:-1433}
+    ;;
+    "postgres" | "postgresql" | "pgsql" | "POSTGRES" | "POSTGRESQL" | "PGSQL" )
+        dbtype=pgsql
+        dbport=${DB_PORT:-5432}
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
+    ;;
+    "redis" | "REDIS"   )
+        dbtype=redis
+        dbport=${DB_PORT:-6379}
+        [[ ( -n "${DB_PASS}" || ( -n "${DB_PASS_FILE}" ) ) ]] && file_env 'DB_PASS'
+    ;;
+esac
 
 ### Set Defaults
 BACKUP_LOCATION=${BACKUP_LOCATION:-"FILESYSTEM"}
@@ -27,7 +67,6 @@ DB_DUMP_TARGET=${DB_DUMP_TARGET:-/backup}
 dbhost=${DB_HOST}
 dbname=${DB_NAME}
 dbpass=${DB_PASS}
-dbtype=${DB_TYPE}
 dbuser=${DB_USER}
 MD5=${MD5:-TRUE}
 PARALLEL_COMPRESSION=${PARALLEL_COMPRESSION:-TRUE}
@@ -35,7 +74,7 @@ SIZE_VALUE=${SIZE_VALUE:-"bytes"}
 SPLIT_DB=${SPLIT_DB:-FALSE}
 tmpdir=/tmp/backups
 
-if [ "BACKUP_TYPE" = "S3" ] || [ "BACKUP_TYPE" = "s3" ] || [ "BACKUP_TYPE" = "MINIO" ] || [ "BACKUP_TYPE" = "minio" ] ; then
+if [ "$BACKUP_TYPE" = "S3" ] || [ "$BACKUP_TYPE" = "s3" ] || [ "$BACKUP_TYPE" = "MINIO" ] || [ "$BACKUP_TYPE" = "minio" ] ; then
     S3_PROTOCOL=${S3_PROTOCOL:-"https"}
     sanity_var S3_HOST "S3 Host"
     sanity_var S3_BUCKET "S3 Bucket"
@@ -53,7 +92,7 @@ if [ "$1" = "NOW" ]; then
 fi
 
 ### Set Compression Options
-if var_true $PARALLEL_COMPRESSION ; then
+if var_true "$PARALLEL_COMPRESSION" ; then
     bzip="pbzip2 -${COMPRESSION_LEVEL}"
     gzip="pigz -${COMPRESSION_LEVEL}"
     xzip="pixz -${COMPRESSION_LEVEL}"
@@ -65,71 +104,34 @@ else
     zstd="zstd --rm -${COMPRESSION_LEVEL}"
 fi
 
-### Set the Database Type
+### Set the Database Authentication Details
-       case "$dbtype" in
+case "$dbtype" in
-            "couch" | "couchdb" | "COUCH" | "COUCHDB"  )
+    "mongo" )
-                dbtype=couch
-                dbport=${DB_PORT:-5984}
-            ;;
-            "influx" | "influxdb" | "INFLUX" | "INFLUXDB"  )
-                dbtype=influx
-                dbport=${DB_PORT:-8088}
-            ;;
-            "mongo" | "mongodb" | "MONGO" | "MONGODB" )
-            dbtype=mongo
-            dbport=${DB_PORT:-27017}
         [[ ( -n "${DB_USER}" ) ]] && MONGO_USER_STR=" --username ${dbuser}"
         [[ ( -n "${DB_PASS}" ) ]] && MONGO_PASS_STR=" --password ${dbpass}"
         [[ ( -n "${DB_NAME}" ) ]] && MONGO_DB_STR=" --db ${dbname}"
     ;;
-            "mysql" | "MYSQL" | "mariadb" | "MARIADB")
+    "mysql" )
-                dbtype=mysql
-                dbport=${DB_PORT:-3306}
         [[ ( -n "${DB_PASS}" ) ]] && export MYSQL_PWD=${dbpass}
     ;;
-            "postgres" | "postgresql" | "pgsql" | "POSTGRES" | "POSTGRESQL" | "PGSQL" )
+    "postgres" )
-                dbtype=pgsql
-                dbport=${DB_PORT:-5432}
         [[ ( -n "${DB_PASS}" ) ]] && POSTGRES_PASS_STR="PGPASSWORD=${dbpass}"
     ;;
-            "redis" | "REDIS"   )
+    "redis" )
-                dbtype=redis
-                dbport=${DB_PORT:-6379}
         [[ ( -n "${DB_PASS}" ) ]] && REDIS_PASS_STR=" -a ${dbpass}"
     ;;
-        esac
+esac
 
 ### Functions
 backup_couch() {
     target=couch_${dbname}_${dbhost}_${now}.txt
     compression
     curl -X GET http://${dbhost}:${dbport}/${dbname}/_all_docs?include_docs=true ${dumpoutput} | $dumpoutput > ${tmpdir}/${target}
+    exit_code=$?
     generate_md5
     move_backup
 }
 
-backup_mysql() {
-    if var_true $SPLIT_DB ; then
-        DATABASES=`mysql -h ${dbhost} -P $dbport -u$dbuser --batch -e "SHOW DATABASES;" | grep -v Database|grep -v schema`
-
-        for db in $DATABASES; do
-                if [[ "$db" != "information_schema" ]] && [[ "$db" != _* ]] ; then
-                    print_notice "Dumping MariaDB database: $db"
-                    target=mysql_${db}_${dbhost}_${now}.sql
-                    compression
-                    mysqldump --max-allowed-packet=512M -h $dbhost -P $dbport -u$dbuser  ${EXTRA_OPTS} --databases $db | $dumpoutput > ${tmpdir}/${target}
-                    generate_md5
-                    move_backup
-                fi
-        done
-    else
-        compression
-        mysqldump --max-allowed-packet=512M -A -h $dbhost -P $dbport -u$dbuser  ${EXTRA_OPTS} | $dumpoutput > ${tmpdir}/${target}
-        generate_md5
-        move_backup
-    fi
-}
-
 backup_influx() {
     if [ "${COMPRESSION}" = "NONE" ] || [ "${COMPRESSION}" = "none" ] || [ "${COMPRESSION}" = "FALSE" ] || [ "${COMPRESSION}" = "false" ] ; then
         :
@@ -138,7 +140,9 @@ backup_influx() {
         influx_compression="-portable"
     fi
     for DB in $DB_NAME; do
+        target=influx_${DB}_${dbhost}_${now}
         influxd backup ${influx_compression} -database $DB -host ${dbhost}:${dbport} ${tmpdir}/${target}
+        exit_code=$?
         generate_md5
         move_backup
     done
@@ -153,20 +157,51 @@ backup_mongo() {
         mongo_compression="--gzip"
     fi
     mongodump --archive=${tmpdir}/${target} ${mongo_compression} --host ${dbhost} --port ${dbport} ${MONGO_USER_STR}${MONGO_PASS_STR}${MONGO_DB_STR} ${EXTRA_OPTS}
+    exit_code=$?
     cd ${tmpdir}
     generate_md5
     move_backup
 }
 
+backup_mssql() {
+    target=mssql_${dbname}_${dbhost}_${now}.bak
+    /opt/mssql-tools/bin/sqlcmd -E -C -S ${dbhost}\,${dbport} -U ${dbuser} -P ${dbpass} –Q "BACKUP DATABASE \[${dbname}\] TO DISK = N'${tmpdir}/${target}' WITH NOFORMAT, NOINIT, NAME = '${dbname}-full', SKIP, NOREWIND, NOUNLOAD, STATS = 10"
+}
+
+backup_mysql() {
+    if var_true "$SPLIT_DB" ; then
+        DATABASES=$(mysql -h ${dbhost} -P $dbport -u$dbuser --batch -e "SHOW DATABASES;" | grep -v Database|grep -v schema)
+
+        for db in $DATABASES; do
+                if [[ "$db" != "information_schema" ]] && [[ "$db" != _* ]] ; then
+                    print_notice "Dumping MariaDB database: $db"
+                    target=mysql_${db}_${dbhost}_${now}.sql
+                    compression
+                    mysqldump --max-allowed-packet=512M -h $dbhost -P $dbport -u$dbuser  ${EXTRA_OPTS} --databases $db | $dumpoutput > ${tmpdir}/${target}
+                    exit_code=$?
+                    generate_md5
+                    move_backup
+                fi
+        done
+    else
+        compression
+        mysqldump --max-allowed-packet=512M -A -h $dbhost -P $dbport -u$dbuser  ${EXTRA_OPTS} | $dumpoutput > ${tmpdir}/${target}
+        exit_code=$?
+        generate_md5
+        move_backup
+    fi
+}
+
 backup_pgsql() {
   if var_true $SPLIT_DB ; then
       export PGPASSWORD=${dbpass}
-      DATABASES=`psql -h $dbhost -U $dbuser -p ${dbport} -c 'COPY (SELECT datname FROM pg_database WHERE datistemplate = false) TO STDOUT;' `
+      DATABASES=$(psql -h $dbhost -U $dbuser -p ${dbport} -c 'COPY (SELECT datname FROM pg_database WHERE datistemplate = false) TO STDOUT;' )
             for db in $DATABASES; do
                 print_info "Dumping database: $db"
                 target=pgsql_${db}_${dbhost}_${now}.sql
                 compression
                 pg_dump -h ${dbhost} -p ${dbport} -U ${dbuser} $db ${EXTRA_OPTS} | $dumpoutput > ${tmpdir}/${target}
+                exit_code=$?
                 generate_md5
                 move_backup
             done
@@ -174,6 +209,7 @@ backup_pgsql() {
             export PGPASSWORD=${dbpass}
             compression
             pg_dump -h ${dbhost} -U ${dbuser} -p ${dbport} ${dbname} ${EXTRA_OPTS} | $dumpoutput > ${tmpdir}/${target}
+            exit_code=$?
             generate_md5
             move_backup
   fi
@@ -207,39 +243,47 @@ check_availability() {
             COUNTER=0
             while ! (nc -z ${dbhost} ${dbport}) ; do
                 sleep 5
-                let COUNTER+=5
+                (( COUNTER+=5 ))
-                print_warn "CouchDB Host '"$dbhost"' is not accessible, retrying.. ($COUNTER seconds so far)"
+                print_warn "CouchDB Host '${dbhost}' is not accessible, retrying.. ($COUNTER seconds so far)"
             done
         ;;
         "influx" )
             COUNTER=0
             while ! (nc -z ${dbhost} ${dbport}) ; do
                 sleep 5
-                let COUNTER+=5
+                (( COUNTER+=5 ))
-                print_warn "InfluxDB Host '"$dbhost"' is not accessible, retrying.. ($COUNTER seconds so far)"
+                print_warn "InfluxDB Host '${dbhost}' is not accessible, retrying.. ($COUNTER seconds so far)"
             done
         ;;
         "mongo" )
             COUNTER=0
             while ! (nc -z ${dbhost} ${dbport}) ; do
                 sleep 5
-                let COUNTER+=5
+                (( COUNTER+=5 ))
-                print_warn "Mongo Host '"$dbhost"' is not accessible, retrying.. ($COUNTER seconds so far)"
+                print_warn "Mongo Host '${dbhost}' is not accessible, retrying.. ($COUNTER seconds so far)"
             done
         ;;
         "mysql" )
             COUNTER=0
             while true; do
                 mysqlcmd='mysql -u'${dbuser}' -P '${dbport}' -h '${dbhost}' -p'${dbpass}
-                out="`$mysqlcmd -e "SELECT COUNT(*) FROM information_schema.FILES;" 2>&1`"
+                out="$($mysqlcmd -e "SELECT COUNT(*) FROM information_schema.FILES;" 2>&1)"
                 echo "$out" | grep -E "COUNT|Enter" 2>&1 > /dev/null
                 if [ $? -eq 0 ]; then
                     :
                     break
                 fi
-                print_warn "MySQL/MariaDB Server "$dbhost" is not accessible, retrying.. ($COUNTER seconds so far)"
+                print_warn "MySQL/MariaDB Server '${dbhost}' is not accessible, retrying.. ($COUNTER seconds so far)"
                 sleep 5
-                let COUNTER+=5
+                (( COUNTER+=5 ))
+            done
+        ;;
+        "mssql" )
+            COUNTER=0
+            while ! (nc -z ${dbhost} ${dbport}) ; do
+                sleep 5
+                (( COUNTER+=5 ))
+                print_warn "MSSQL Host '${dbhost}' is not accessible, retrying.. ($COUNTER seconds so far)"
             done
         ;;
         "pgsql" )
@@ -248,16 +292,16 @@ check_availability() {
             until pg_isready --dbname=${dbname} --host=${dbhost} --port=${dbport} --username=${dbuser} -q
             do
                 sleep 5
-                let COUNTER+=5
+                (( COUNTER+=5 ))
-                print_warn "Postgres Host '"$dbhost"' is not accessible, retrying.. ($COUNTER seconds so far)"
+                print_warn "Postgres Host '${dbhost}' is not accessible, retrying.. ($COUNTER seconds so far)"
             done
         ;;
         "redis" )
             COUNTER=0
-            while ! (nc -z ${dbhost} ${dbport}) ; do
+            while ! (nc -z "${dbhost}" "${dbport}") ; do
                 sleep 5
-                let COUNTER+=5
+                (( COUNTER+=5 ))
-                print_warn "Redis Host '"$dbhost"' is not accessible, retrying.. ($COUNTER seconds so far)"
+                print_warn "Redis Host '${dbhost}' is not accessible, retrying.. ($COUNTER seconds so far)"
             done
         ;;
     esac
@@ -292,11 +336,11 @@ compression() {
 }
 
 generate_md5() {
-if var_true $MD5 ; then
+if var_true "$MD5" ; then
     print_notice "Generating MD5 for ${target}"
     cd $tmpdir
-    md5sum ${target} > ${target}.md5
+    md5sum "${target}" > "${target}".md5
-    MD5VALUE=$(md5sum ${target} | awk '{ print $1}')
+    MD5VALUE=$(md5sum "${target}" | awk '{ print $1}')
 fi
 }
 
@@ -323,24 +367,24 @@ move_backup() {
 
     case "${BACKUP_LOCATION}" in
         "FILE" | "file" | "filesystem" | "FILESYSTEM" )
-            mkdir -p ${DB_DUMP_TARGET}
+            mkdir -p "${DB_DUMP_TARGET}"
-            mv ${tmpdir}/*.md5 ${DB_DUMP_TARGET}/
+            mv ${tmpdir}/*.md5 "${DB_DUMP_TARGET}"/
-            mv ${tmpdir}/${target} ${DB_DUMP_TARGET}/${target}
+            mv ${tmpdir}/"${target}" "${DB_DUMP_TARGET}"/"${target}"
         ;;
         "S3" | "s3" | "MINIO" | "minio" )
             s3_content_type="application/octet-stream"
-            if [ "$S3_URI_STYLE" = "VIRTUALHOST" ] || [ "$S3_URI_STYLE" = "VHOST" ] [ "$S3_URI_STYLE" = "virtualhost" ] [ "$S3_URI_STYLE" = "vhost" ] ; then
+            if [ "$S3_URI_STYLE" = "VIRTUALHOST" ] || [ "$S3_URI_STYLE" = "VHOST" ] || [ "$S3_URI_STYLE" = "virtualhost" ] || [ "$S3_URI_STYLE" = "vhost" ] ; then
                 s3_url="${S3_BUCKET}.${S3_HOST}"
             else
                 s3_url="${S3_HOST}/${S3_BUCKET}"
             fi
 
-            if var_true $MD5 ; then
+            if var_true "$MD5" ; then
                 s3_date="$(LC_ALL=C date -u +"%a, %d %b %Y %X %z")"
                 s3_md5="$(libressl md5 -binary < "${tmpdir}/${target}.md5" | base64)"
                 sig="$(printf "PUT\n$s3_md5\n${s3_content_type}\n$s3_date\n/$S3_BUCKET/$S3_PATH/${target}.md5" | libressl sha1 -binary -hmac "${S3_KEY_SECRET}" | base64)"
                 print_debug "Uploading ${target}.md5 to S3"
-                curl -T "${tmpdir}/${target}.md5" ${S3_PROTOCOL}://${s3_url}/${S3_PATH}/${target}.md5 \
+                curl -T "${tmpdir}/${target}.md5" "${S3_PROTOCOL}"://"${s3_url}"/"${S3_PATH}"/"${target}".md5 \
                      -H "Date: $date" \
                      -H "Authorization: AWS ${S3_KEY_ID}:$sig" \
                      -H "Content-Type: ${s3_content_type}" \
@@ -351,23 +395,24 @@ move_backup() {
             s3_md5="$(libressl md5 -binary < "${tmpdir}/${target}" | base64)"
             sig="$(printf "PUT\n$s3_md5\n${s3_content_type}\n$s3_date\n/$S3_BUCKET/$S3_PATH/${target}" | libressl sha1 -binary -hmac "${S3_KEY_SECRET}" | base64)"
             print_debug "Uploading ${target} to S3"
-            curl -T ${tmpdir}/${target} ${S3_PROTOCOL}://${s3_url}/${S3_PATH}/${target} \
+            curl -T ${tmpdir}/"${target}" "${S3_PROTOCOL}"://"${s3_url}"/"${S3_PATH}"/"${target}" \
                  -H "Date: $s3_date" \
                  -H "Authorization: AWS ${S3_KEY_ID}:$sig" \
                  -H "Content-Type: ${s3_content_type}" \
                  -H "Content-MD5: ${s3_md5}"
 
             rm -rf ${tmpdir}/*.md5
-            rm -rf ${tmpdir}/${target}
+            rm -rf ${tmpdir}/"${target}"
         ;;
     esac
 }
 
 
 ### Container Startup
-print_info "Backup routines Initialized on `date`"
+print_debug "Backup routines Initialized on $(date)"
 
 ### Wait for Next time to start backup
+  if [ "$1" != "NOW" ]; then
     current_time=$(date +"%s")
     today=$(date +"%Y%m%d")
 
@@ -381,7 +426,9 @@ print_info "Backup routines Initialized on `date`"
         waittime=$(($target_time - $current_time))
     fi
 
+        print_notice "Next Backup at $(date -d @${target_time} +"%Y-%m-%d %T %Z")"
         sleep $waittime
+  fi
 
 
 ### Commence Backup
@@ -405,6 +452,10 @@ print_info "Backup routines Initialized on `date`"
             check_availability
             backup_influx
         ;;
+        "mssql" )
+            check_availability
+            backup_mssql
+        ;;
         "mysql" )
             check_availability
             backup_mysql
@@ -424,26 +475,31 @@ print_info "Backup routines Initialized on `date`"
         esac
 
 ### Zabbix
-    if var_true $ENABLE_ZABBIX ; then
+    if var_true "$ENABLE_ZABBIX" ; 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.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.datetime -o "$(date -r  "${DB_DUMP_TARGET}"/"${target}" +'%s')"
     fi
 
 ### Automatic Cleanup
     if [[ -n "$DB_CLEANUP_TIME" ]]; then
         print_notice "Cleaning up old backups"
-        find $DB_DUMP_TARGET/  -mmin +$DB_CLEANUP_TIME -iname "*" -exec rm {} \;
+        find "${DB_DUMP_TARGET}"/  -mmin +"${DB_CLEANUP_TIME}" -iname "*" -exec rm {} \;
+    fi
+
+    if [ -n "$POST_SCRIPT" ] ; then
+        print_notice "Found POST_SCRIPT environment variable. Executing"
+        eval "${POST_SCRIPT}"
     fi
 
 ### Post Backup Custom Script Support
     if [ -d /assets/custom-scripts/ ] ; then
-    print_notice "Found Custom Scripts to Execute"
+    print_notice "Found Custom Filesystem Scripts to Execute"
     for f in $(find /assets/custom-scripts/ -name \*.sh -type f); do
       print_notice "Running Script ${f}"
-      ## script DB_TYPE DB_HOST DB_NAME DATE BACKUP_FILENAME FILESIZE MD5_VALUE 
+      ## script EXIT_CODE DB_TYPE DB_HOST DB_NAME DATE BACKUP_FILENAME FILESIZE MD5_VALUE
-      chmod +x ${f} 
+      chmod +x "${f}"
-      ${f} "${dbtype}" "${dbhost}" "${dbname}" "${now_date}" "${now_time}" "${target}" "${FILESIZE}" "${MD5VALUE}"
+      ${f} "${exit_code}" "${dbtype}" "${dbhost}" "${dbname}" "${now_date}" "${now_time}" "${target}" "${FILESIZE}" "${MD5VALUE}"
     done
     fi