Release 2.11.4 - See CHANGELOG.md

Github Workflow fix
Update github configuration
2025-12-21 21:33:28 +01:00 · 2022-03-15 10:29:37 -07:00 · 2022-03-01 16:11:30 -08:00 · 2022-02-10 09:28:38 -08:00 · 2022-02-09 19:34:27 -08:00 · 2022-02-09 17:14:25 -08:00
16 changed files with 772 additions and 709 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,42 @@
+---
+name: Bug report
+about: If something isn't working right..
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+### Summary
+
+<!-- Summarize the bug encountered -->
+
+
+### Steps to reproduce
+
+<!-- Describe how one can reproduce the issue - this is very important. Please use an ordered list. -->
+
+
+### What is the expected *correct* behavior?
+
+<!-- Describe what should be seen instead. -->
+
+
+### Relevant logs and/or screenshots
+
+<!-- Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's tough to read otherwise. -->
+
+### Environment
+<!--Your Configuration (please complete the following information): -->
+
+- Image version / tag:  
+- Host OS:
+
+<details>
+<summary>Any logs | docker-compose.yml</summary>
+</details>
+
+<!-- Include anything additional -->
+    
+### Possible fixes
+<!-- If you can, provide details to the root cause that might be responsible for the problem. -->
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea or feature
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+---
+name: Feature Request
+about: Suggest an idea for this project
+
+---
+
+**Description of the feature**
+<!-- A clear description of the feature you'd like implemented  -->
+
+**Benftits of feature**
+<!-- Explain the measurable benefits this feature would achieve. -->
+
+**Additional context**
+<!--Add any other context or screenshots about the feature request here. -->
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
 ### Application Level Image CI
 ### Dave Conroy <dave at tiredofit dot ca>

-name: 'Build Images'
+name: 'build'

 on:
  push:
@@ -87,9 +87,11 @@ jobs:
            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.image.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile
+              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
@@ -105,6 +107,6 @@ jobs:
          builder: ${{ steps.buildx.outputs.name }}
          context: .
          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
          push: true
          tags: ${{ steps.prep.outputs.tags }}
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -0,0 +1,112 @@
+# Manual Workflow (Application)
+
+name: manual
+
+on:
+  workflow_dispatch:
+    inputs:
+      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 }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,144 @@
+## 2.11.4 2022-03-15 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add debug statement around the scheduling component
+
+
+## 2.11.3 2022-02-09 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Rework to support new base image
+
+
+## 2.11.2 2022-02-09 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Refresh base image
+
+
+## 2.11.1 2022-01-20 <jacksgt@github>
+
+   ### Changed
+      - Modernized S3 variables and sanity checks
+      - Change exit code to 0 when executing a manual backup
+
+
+## 2.11.0 2022-01-20 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add capability to select `TEMP_LOCATION` for initial backup and compression before backup completes to avoid filling system memory
+
+   ### Changed
+      - Cleanup for MariaDB/MySQL DB ready routines that half worked in 2.10.3
+      - Code cleanup
+
+
+## 2.10.3 2022-01-07 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Change the way MariaD/MySQL connectivity check is performed to allow for better compatibility without requiring the DB_USER to have PROCESS privileges
+
+
+## 2.10.2 2021-12-28 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Remove logrotate configuration for redis which shouldn't exist in the first place
+
+
+## 2.10.1 2021-12-22 <milenkara@github>
+
+   ### Added
+     - Allow for choosing region when backing up to S3
+
+## 2.10.0 2021-12-22 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Revert back to Postgresql 14 from packages as its now in the repositories
+      - Fix for Zabbix Monitoring
+
+
+## 2.9.7 2021-12-15 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fixup for Zabbix Autoagent registration
+
+
+## 2.9.6 2021-12-03 <alexbarcello@githuba>
+
+   ### Changed
+      - Fix for S3 Minio backup targets
+      - Fix for annoying output on certain target time print conditions
+
+## 2.9.5 2021-12-07 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for 2.9.3
+
+
+## 2.9.4 2021-12-07 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add Zabbix auto register support for templates
+
+
+## 2.9.3 2021-11-24 <dave at tiredofit dot ca>
+
+   ### Added
+      - Alpine 3.15 base
+
+
+## 2.9.2 2021-10-22 <teenigma@github>
+   
+   ### Fixed
+      - Fix compression failing on Redis backup
+
+## 2.9.1 2021-10-15 <sbrunecker@github>
+
+   ### Fixed
+      - Allow MariaDB 8.0 servers to be backed up
+      - Fixed DB available check getting stuck with empty password
+
+## 2.9.0 2021-10-15 <dave at tiredofit dot ca>
+
+   ### Added
+      - Postgresql 14 Support (compiled)
+      - MSSQL 17.8.1.1
+
+
+## 2.8.2 2021-10-15 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Change to using aws cli from Alpine repositories (fixes #81)
+
+
+## 2.8.1 2021-09-01 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Modernize image with updated environment varialbes from upstream
+
+
+## 2.8.0 2021-08-27 <dave at tiredofit dot ca>
+
+   ### Added
+      - Alpine 3.14 Base
+
+   ### Changed
+      - Fix for syntax error in 2.7.0 Release (Credit the1ts@github)
+      - Cleanup image and leftover cache with AWS CLI installation
+
+
+## 2.7.0 2021-06-17 <dave at tiredofit dot ca>
+
+   ### Added
+      - MongoDB Authentication Database support (DB_AUTH)
+
+
+## 2.6.1 2021-06-08 <jwillmer@github>
+
+   ### Changed
+      - Fix for Issue #14 - SPLIT_DB=TRUE was not working for Postgres DB server
+
+
 ## 2.6.0 2021-02-19 <tpansino@github>

   ### Added
--- a/30
+++ b/30
@@ -1,13 +1,14 @@
-FROM tiredofit/alpine:3.13
+FROM docker.io/tiredofit/alpine:3.15
+LABEL maintainer="Dave Conroy (github.com/tiredofit)"

 ### Set Environment Variables
-ENV MSSQL_VERSION=17.5.2.1-1 \
-    ENABLE_CRON=FALSE \
-    ENABLE_SMTP=FALSE \
-    ENABLE_ZABBIX=TRUE \
-    ZABBIX_HOSTNAME=db-backup
+ENV MSSQL_VERSION=17.8.1.1-1 \
+    CONTAINER_ENABLE_MESSAGING=FALSE \
+    CONTAINER_ENABLE_MONITORING=TRUE \
+    IMAGE_NAME="tiredofit/db-backup" \
+    IMAGE_REPO_URL="https://github.com/tiredofit/docker-db-backup/"

-    ### Dependencies
+### Dependencies
 RUN set -ex && \
    apk update && \
    apk upgrade && \
@@ -20,10 +21,12 @@ RUN set -ex && \
               && \
    \
    apk add --no-cache -t .db-backup-run-deps \
-      	       bzip2 \
+               aws-cli \
+               bzip2 \
               influxdb \
               libarchive \
               mariadb-client \
+               mariadb-connector-c \
               mongodb-tools \
               libressl \
               pigz \
@@ -55,13 +58,14 @@ RUN set -ex && \
        --sysconfdir=/etc \
        --localstatedir=/var \
        && \
-     make && \
-     make install && \
-     \
+    make && \
+    make install && \
+    \
 ### Cleanup
    apk del .db-backup-build-deps && \
    rm -rf /usr/src/* && \
-    rm -rf /tmp/* /var/cache/apk/*
+    rm -rf /etc/logrotate.d/redis && \
+    rm -rf /root/.cache /tmp/* /var/cache/apk/*

 ### S6 Setup
-    ADD install  /
+ADD install  /
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2020 Dave Conroy
+Copyright (c) 2022 Dave Conroy

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -1,13 +1,16 @@
-# hub.docker.com/r/tiredofit/db-backup
+# github.com/tiredofit/docker-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)
+[![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)
+[![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)

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

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

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

@@ -22,53 +25,61 @@ Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers.
 * 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

-* This Container uses a [customized Alpine Linux base](https://hub.docker.com/r/tiredofit/alpine) which includes [s6 overlay](https://github.com/just-containers/s6-overlay) enabled for PID 1 Init capabilities, [zabbix-agent](https://zabbix.org) for individual container monitoring, Cron also installed along with other tools (bash,curl, less, logrotate, nano, vim) for easier management. It also supports sending to external SMTP servers.
-
-[Changelog](CHANGELOG.md)
-
-## Authors
+## Maintainer

 - [Dave Conroy](https://github.com/tiredofit)

 ## Table of Contents

- [hub.docker.com/r/tiredofit/db-backup](#hubdockercomrtiredofitdb-backup)
-  - [Introduction](#introduction)
-  - [Authors](#authors)
-  - [Table of Contents](#table-of-contents)
-  - [Prerequisites](#prerequisites)
-  - [Installation](#installation)
-    - [Quick Start](#quick-start)
-  - [Configuration](#configuration)
-    - [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)
+- [About](#about)
+- [Maintainer](#maintainer)
+- [Table of Contents](#table-of-contents)
+- [Prerequisites and Assumptions](#prerequisites-and-assumptions)
+- [Installation](#installation)
+  - [Build from Source](#build-from-source)
+  - [Prebuilt Images](#prebuilt-images)
+- [Configuration](#configuration)
+  - [Quick Start](#quick-start)
+  - [Persistent Storage](#persistent-storage)
+  - [Environment Variables](#environment-variables)
+    - [Base Images used](#base-images-used)
+    - [Backing Up to S3 Compatible Services](#backing-up-to-s3-compatible-services)
+- [Maintenance](#maintenance)
+  - [Shell Access](#shell-access)
+  - [Manual Backups](#manual-backups)
+  - [Custom Scripts](#custom-scripts)
+- [Support](#support)
+  - [Usage](#usage)
+  - [Bugfixes](#bugfixes)
+  - [Feature Requests](#feature-requests)
+  - [Updates](#updates)
+- [License](#license)

-## Prerequisites
+## Prerequisites and Assumptions

 You must have a working DB server or container available for this to work properly, it does not provide server functionality!

 ## 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.
+### Build from Source
+Clone this repository and build the image with `docker build -t (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.

 ```bash
-docker pull tiredofit/db-backup:latest
+docker pull tiredofit/db-backup:(imagetag)
 ```

+The following image tags are available along with their tagged release based on what's written in the [Changelog](CHANGELOG.md):
+
+| Container OS | Tag       |
+| ------------ | --------- |
+| Alpine       | `:latest` |
+
+
+## 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.
@@ -77,10 +88,7 @@ docker pull tiredofit/db-backup:latest
 * Map [persistent storage](#data-volumes) for access to configuration and data files for backup.

 > **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
-
-### Data-Volumes
+### Persistent Storage

 The following directories are used for configuration and can be mapped for persistent storage.

@@ -88,63 +96,80 @@ The following directories are used for configuration and can be mapped for persi
 | ------------------------ | ---------------------------------------------------------------------------------- |
 | `/backup`                | Backups                                                                            |
 | `/assets/custom-scripts` | *Optional* Put custom scripts in this directory to execute after backup operations |
-
 ### Environment Variables

-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.
+#### Base Images used

-| Parameter              | Description                                                                                                                                                                                        |
-| ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `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_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` `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                                                                                                                                   |
-| `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                                                                                                               |
-|                        | 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. |
-| `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"                                                                                                    |
-| `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`                                                           |
+This image relies on an [Alpine Linux](https://hub.docker.com/r/tiredofit/alpine) base image that relies on an [init system](https://github.com/just-containers/s6-overlay) for added capabilities. Outgoing SMTP capabilities are handlded via `msmtp`. Individual container performance monitoring is performed by [zabbix-agent](https://zabbix.org). Additional tools include: `bash`,`curl`,`less`,`logrotate`, `nano`,`vim`.

-When using compression with MongoDB, only `GZ` compression is possible.
+Be sure to view the following repositories to understand all the customizable options:

-**Backing Up to S3 Compatible Services**
+| Image                                                  | Description                            |
+| ------------------------------------------------------ | -------------------------------------- |
+| [OS Base](https://github.com/tiredofit/docker-alpine/) | Customized Image based on Alpine Linux |
+
+
+| Parameter                  | Description                                                                                                                                                                                        | Default         |
+| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
+| `BACKUP_LOCATION`          | Backup to `FILESYSTEM` or `S3` compatible services like S3, Minio, Wasabi                                                                                                                          | `FILESYSTEM`    |
+| `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`             |
+| `DB_AUTH`                  | (Mongo Only - Optional) Authentication Database                                                                                                                                                    |                 |
+| `DB_TYPE`                  | Type of DB Server to backup `couch` `influx` `mysql` `pgsql` `mongo` `redis` `sqlite3`                                                                                                             |                 |
+| `DB_HOST`                  | Server Hostname e.g. `mariadb`. For `sqlite3`, full path to DB file e.g. `/backup/db.sqlite3`                                                                                                      |                 |
+| `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          |
+| `DB_DUMP_FREQ`             | How often to do a dump, in minutes. Defaults to 1440 minutes, or once per day.                                                                                                                     | `1440`          |
+| `DB_DUMP_BEGIN`            | What time to do the first dump. Defaults to immediate. Must be in one of two formats                                                                                                               |                 |
+|                            | Absolute HHMM, e.g. `2330` or `0415`                                                                                                                                                               |                 |
+|                            | Relative +MM, i.e. how many minutes after starting the container, e.g. `+0` (immediate), `+10` (in 10 minutes), or `+90` in an hour and a half                                                     |                 |
+| `DB_CLEANUP_TIME`          | Value in minutes to delete old backups (only fired when dump freqency fires). 1440 would delete anything above 1 day old. You don't need to set this variable if you want to hold onto everything. | `FALSE`         |
+| `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`                                                                                                    |                 |
+| `MYSQL_MAX_ALLOWED_PACKET` | Max allowed packet if backing up MySQL / MariaDB                                                                                                                                                   | `512M`          |
+| `MD5`                      | Generate MD5 Sum in Directory, `TRUE` or `FALSE`                                                                                                                                                   | `TRUE`          |
+| `PARALLEL_COMPRESSION`     | Use multiple cores when compressing backups `TRUE` or `FALSE`                                                                                                                                      | `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.                                                                             | `FALSE`         |
+| `TEMP_LOCATION`            | Perform Backups and Compression in this temporary directory                                                                                                                                        | `/tmp/backups/` |
+
+- When using compression with MongoDB, only `GZ` compression is possible.
+- 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.
+
+
+
+#### 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_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_PROTOCOL`   | Use either `http` or `https` to access service - Default `https`                        |
-| `S3_URI_STYLE`  | Choose either `VIRTUALHOST` or `PATH` style - Default `VIRTUALHOST`                     |
+| `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`.        |
+

 ## Maintenance

-Manual Backups can be performed by entering the container and typing `backup-now`

 ### Shell Access

 For debugging and maintenance purposes you may want access the containers shell.

-```bash
-docker exec -it (whatever your container name is e.g.) db-backup 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`

-#### Custom Scripts
+
+### 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:

@@ -152,16 +177,16 @@ If you want to execute a custom script at the end of backup, you can drop bash s
 $ cat post-script.sh
 ##!/bin/bash

-## Example Post Script
-## $1=EXIT_CODE (After running backup routine)
-## $2=DB_TYPE (Type of Backup)
-## $3=DB_HOST (Backup Host)
-## #4=DB_NAME (Name of Database backed up
-## $5=DATE (Date of Backup)
-## $6=TIME (Time of Backup)
-## $7=BACKUP_FILENAME (Filename of Backup)
-## $8=FILESIZE (Filesize of backup)
-## $9=MD5_RESULT (MD5Sum if enabled)
+# #### Example Post Script
+# #### $1=EXIT_CODE (After running backup routine)
+# #### $2=DB_TYPE (Type of Backup)
+# #### $3=DB_HOST (Backup Host)
+# #### #4=DB_NAME (Name of Database backed up
+# #### $5=DATE (Date of Backup)
+# ####  $6=TIME (Time of Backup)
+# ####  $7=BACKUP_FILENAME (Filename of Backup)
+# ####  $8=FILESIZE (Filesize of backup)
+# ####  $9=MD5_RESULT (MD5Sum if enabled)

 echo "${1} ${2} Backup Completed on ${3} for ${4} on ${5} ${6}. Filename: ${7} Size: ${8} bytes MD5: ${9}"
 ````
@@ -171,3 +196,23 @@ Outputs the following on the console:
 `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`
+
+## 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.
+### 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/README.md.save
+++ b/README.md.save
@@ -0,0 +1,219 @@
+# 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)
+[![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.
+
+* dump to local filesystem or backup to S3 Compatible services
+* select database user and password
+* backup all databases
+* choose to have an MD5 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
+* 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
+
+- [Dave Conroy](https://github.com/tiredofit)
+
+## Table of Contents
+
+- [About](#about)
+- [Maintainer](#maintainer)
+- [Table of Contents](#table-of-contents)
+- [Prerequisites and Assumptions](#prerequisites-and-assumptions)
+- [Installation](#installation)
+  - [Build from Source](#build-from-source)
+  - [Prebuilt Images](#prebuilt-images)
+- [Configuration](#configuration)
+  - [Quick Start](#quick-start)
+  - [Persistent Storage](#persistent-storage)
+  - [Environment Variables](#environment-variables)
+    - [Base Images used](#base-images-used)
+    - [Backing Up to S3 Compatible Services](#backing-up-to-s3-compatible-services)
+- [Maintenance](#maintenance)
+  - [Shell Access](#shell-access)
+  - [Manual Backups](#manual-backups)
+  - [Custom Scripts](#custom-scripts)
+- [Support](#support)
+  - [Usage](#usage)
+  - [Bugfixes](#bugfixes)
+  - [Feature Requests](#feature-requests)
+  - [Updates](#updates)
+- [License](#license)
+
+## Prerequisites and Assumptions
+
+You must have a working DB server or container available for this to work properly, it does not provide server functionality!
+
+## Installation
+
+### Build from Source
+Clone this repository and build the image with `docker build -t (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.
+
+```bash
+docker pull tiredofit/db-backup:(imagetag)
+```
+
+The following image tags are available along with their tagged release based on what's written in the [Changelog](CHANGELOG.md):
+
+| Container OS | Tag       |
+| ------------ | --------- |
+| Alpine       | `:latest` |
+
+
+## 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.
+
+* Set various [environment variables](#environment-variables) to understand the capabiltiies of this image.
+* Map [persistent storage](#data-volumes) for access to configuration and data files for backup.
+
+> **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
+
+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 |
+### Environment Variables
+
+#### Base Images used
+
+This image relies on an [Alpine Linux](https://hub.docker.com/r/tiredofit/alpine) base image that relies on an [init system](https://github.com/just-containers/s6-overlay) for added capabilities. Outgoing SMTP capabilities are handlded via `msmtp`. Individual container performance monitoring is performed by [zabbix-agent](https://zabbix.org). Additional tools include: `bash`,`curl`,`less`,`logrotate`, `nano`,`vim`.
+
+Be sure to view the following repositories to understand all the customizable options:
+
+| Image                                                  | Description                            |
+| ------------------------------------------------------ | -------------------------------------- |
+| [OS Base](https://github.com/tiredofit/docker-alpine/) | Customized Image based on Alpine Linux |
+
+
+| Parameter                  | Description                                                                                                                                                                                        | Default         |
+| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
+| `BACKUP_LOCATION`          | Backup to `FILESYSTEM` or `S3` compatible services like S3, Minio, Wasabi                                                                                                                          | `FILESYSTEM`    |
+| `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`             |
+| `DB_AUTH`                  | (Mongo Only - Optional) Authentication Database                                                                                                                                                    |                 |
+| `DB_TYPE`                  | Type of DB Server to backup `couch` `influx` `mysql` `pgsql` `mongo` `redis` `sqlite3`                                                                                                             |                 |
+| `DB_HOST`                  | Server Hostname e.g. `mariadb`. For `sqlite3`, full path to DB file e.g. `/backup/db.sqlite3`                                                                                                      |                 |
+| `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          |
+| `DB_DUMP_FREQ`             | How often to do a dump, in minutes. Defaults to 1440 minutes, or once per day.                                                                                                                     | `1440`          |
+| `DB_DUMP_BEGIN`            | What time to do the first dump. Defaults to immediate. Must be in one of two formats                                                                                                               |                 |
+|                            | Absolute HHMM, e.g. `2330` or `0415`                                                                                                                                                               |                 |
+|                            | Relative +MM, i.e. how many minutes after starting the container, e.g. `+0` (immediate), `+10` (in 10 minutes), or `+90` in an hour and a half                                                     |                 |
+| `DB_CLEANUP_TIME`          | Value in minutes to delete old backups (only fired when dump freqency fires). 1440 would delete anything above 1 day old. You don't need to set this variable if you want to hold onto everything. | `FALSE`         |
+| `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`                                                                                                    |                 |
+| `MYSQL_MAX_ALLOWED_PACKET` | Max allowed packet if backing up MySQL / MariaDB                                                                                                                                                   | `512M`          |
+| `MD5`                      | Generate MD5 Sum in Directory, `TRUE` or `FALSE`                                                                                                                                                   | `TRUE`          |
+| `PARALLEL_COMPRESSION`     | Use multiple cores when compressing backups `TRUE` or `FALSE`                                                                                                                                      | `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.                                                                             | `FALSE`         |
+| `TEMP_LOCATION`            | Perform Backups and Compression in this temporary directory                                                                                                                                        | `/tmp/backups/` |
+
+- When using compression with MongoDB, only `GZ` compression is possible.
+
+- 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.
+
+
+
+#### 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_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`.        |
+
+
+## Maintenance
+
+
+### Shell Access
+
+For debugging and maintenance purposes you may want access the containers shell.
+
+``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`
+
+
+### 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:
+
+````bash
+$ cat post-script.sh
+##!/bin/bash
+
+# #### Example Post Script
+# #### $1=EXIT_CODE (After running backup routine)
+# #### $2=DB_TYPE (Type of Backup)
+# #### $3=DB_HOST (Backup Host)
+# #### #4=DB_NAME (Name of Database backed up
+# #### $5=DATE (Date of Backup)
+# ####  $6=TIME (Time of Backup)
+# ####  $7=BACKUP_FILENAME (Filename of Backup)
+# ####  $8=FILESIZE (Filesize of backup)
+# ####  $9=MD5_RESULT (MD5Sum if enabled)
+
+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:
+
+`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`
+
+## 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.
+### 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/docker-compose.yml
+++ b/examples/docker-compose.yml
--- a/install/etc/cont-finish.d/10-db-backup
+++ b/install/etc/cont-finish.d/10-db-backup
@@ -1,4 +1,3 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash

 pkill bash
-
--- a/install/etc/cont-init.d/10-db-backup
+++ b/install/etc/cont-init.d/10-db-backup
@@ -0,0 +1,11 @@
+#!/command/with-contenv bash
+
+source /assets/functions/00-container
+prepare_service single
+prepare_service 03-monitoring
+PROCESS_NAME="db-backup"
+output_off
+
+create_zabbix dbbackup
+
+liftoff
--- a/install/etc/services.available/10-db-backup/run
+++ b/install/etc/services.available/10-db-backup/run
@@ -1,7 +1,6 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash

 source /assets/functions/00-container
-
 PROCESS_NAME="db-backup"

 date >/dev/null
@@ -40,7 +39,8 @@ case "$dbtype" in
        dbtype=mysql
        dbport=${DB_PORT:-3306}
        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
-    ;;
+        MYSQL_MAX_ALLOWED_PACKET=${MYSQL_MAX_ALLOWED_PACKET:-"512M"}
+      ;;
    "mssql" | "MSSQL" | "microsoftsql" | "MICROSOFTSQL")
        apkArch="$(apk --print-arch)"; \
 	    case "$apkArch" in
@@ -67,29 +67,28 @@ esac

 ### Set Defaults
 BACKUP_LOCATION=${BACKUP_LOCATION:-"FILESYSTEM"}
-COMPRESSION=${COMPRESSION:-GZ}
+COMPRESSION=${COMPRESSION:-"GZ"}
 COMPRESSION_LEVEL=${COMPRESSION_LEVEL:-"3"}
 DB_DUMP_BEGIN=${DB_DUMP_BEGIN:-+0}
 DB_DUMP_FREQ=${DB_DUMP_FREQ:-1440}
-DB_DUMP_TARGET=${DB_DUMP_TARGET:-/backup}
+DB_DUMP_TARGET=${DB_DUMP_TARGET:-"/backup"}
 dbhost=${DB_HOST}
 dbname=${DB_NAME}
 dbpass=${DB_PASS}
 dbuser=${DB_USER}
 MD5=${MD5:-TRUE}
-PARALLEL_COMPRESSION=${PARALLEL_COMPRESSION:-TRUE}
+PARALLEL_COMPRESSION=${PARALLEL_COMPRESSION:-"TRUE"}
 SIZE_VALUE=${SIZE_VALUE:-"bytes"}
-SPLIT_DB=${SPLIT_DB:-FALSE}
-tmpdir=/tmp/backups
+SPLIT_DB=${SPLIT_DB:-"FALSE"}
+TEMP_LOCATION=${TEMP_LOCATION:-"/tmp/backups"}

-if [ "$BACKUP_TYPE" = "S3" ] || [ "$BACKUP_TYPE" = "s3" ] || [ "$BACKUP_TYPE" = "MINIO" ] || [ "$BACKUP_TYPE" = "minio" ] ; then
+if [ "$BACKUP_LOCATION" = "S3" ] || [ "$BACKUP_LOCATION" = "s3" ] || [ "$BACKUP_LOCATION" = "MINIO" ] || [ "$BACKUP_LOCATION" = "minio" ] ; then
    S3_PROTOCOL=${S3_PROTOCOL:-"https"}
-    sanity_var S3_HOST "S3 Host"
    sanity_var S3_BUCKET "S3 Bucket"
    sanity_var S3_KEY_ID "S3 Key ID"
    sanity_var S3_KEY_SECRET "S3 Key Secret"
-    sanity_var S3_URI_STYLE "S3 URI Style (Virtualhost or Path)"
    sanity_var S3_PATH "S3 Path"
+    sanity_var S3_REGION "S3 Region"
    file_env 'S3_KEY_ID'
    file_env 'S3_KEY_SECRET'
 fi
@@ -100,7 +99,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}"
@@ -118,6 +117,7 @@ case "$dbtype" in
        [[ ( -n "${DB_USER}" ) ]] && MONGO_USER_STR=" --username ${dbuser}"
        [[ ( -n "${DB_PASS}" ) ]] && MONGO_PASS_STR=" --password ${dbpass}"
        [[ ( -n "${DB_NAME}" ) ]] && MONGO_DB_STR=" --db ${dbname}"
+        [[ ( -n "${DB_AUTH}" ) ]] && MONGO_AUTH_STR=" --authenticationDatabase ${DB_AUTH}"
    ;;
    "mysql" )
        [[ ( -n "${DB_PASS}" ) ]] && export MYSQL_PWD=${dbpass}
@@ -134,7 +134,7 @@ esac
 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}
+    curl -X GET http://${dbhost}:${dbport}/${dbname}/_all_docs?include_docs=true ${dumpoutput} | $dumpoutput > ${TEMP_LOCATION}/${target}
    exit_code=$?
    generate_md5
    move_backup
@@ -147,9 +147,9 @@ backup_influx() {
        print_notice "Compressing InfluxDB backup with gzip"
        influx_compression="-portable"
    fi
-    for DB in $DB_NAME; do
+    for DB in ${DB_NAME}; do
        target=influx_${DB}_${dbhost}_${now}
-        influxd backup ${influx_compression} -database $DB -host ${dbhost}:${dbport} ${tmpdir}/${target}
+        influxd backup ${influx_compression} -database $DB -host ${dbhost}:${dbport} ${TEMP_LOCATION}/${target}
        exit_code=$?
        generate_md5
        move_backup
@@ -164,28 +164,28 @@ backup_mongo() {
        target=${dbtype}_${dbname}_${dbhost}_${now}.archivegz
        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}
+    mongodump --archive=${TEMP_LOCATION}/${target} ${mongo_compression} --host ${dbhost} --port ${dbport} ${MONGO_USER_STR}${MONGO_PASS_STR}${MONGO_AUTH_STR}${MONGO_DB_STR} ${EXTRA_OPTS}
    exit_code=$?
-    cd ${tmpdir}
+    cd ${TEMP_LOCATION}
    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"
+    /opt/mssql-tools/bin/sqlcmd -E -C -S ${dbhost}\,${dbport} -U ${dbuser} -P ${dbpass} –Q "BACKUP DATABASE \[${dbname}\] TO DISK = N'${TEMP_LOCATION}/${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)
+    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}
+                    mysqldump --max-allowed-packet=${MYSQL_MAX_ALLOWED_PACKET} -h $dbhost -P $dbport -u$dbuser  ${EXTRA_OPTS} --databases $db | $dumpoutput > ${TEMP_LOCATION}/${target}
                    exit_code=$?
                    generate_md5
                    move_backup
@@ -193,7 +193,7 @@ backup_mysql() {
        done
    else
        compression
-        mysqldump --max-allowed-packet=512M -A -h $dbhost -P $dbport -u$dbuser  ${EXTRA_OPTS} | $dumpoutput > ${tmpdir}/${target}
+        mysqldump --max-allowed-packet=${MYSQL_MAX_ALLOWED_PACKET} -A -h $dbhost -P $dbport -u$dbuser  ${EXTRA_OPTS} | $dumpoutput > ${TEMP_LOCATION}/${target}
        exit_code=$?
        generate_md5
        move_backup
@@ -201,31 +201,33 @@ backup_mysql() {
 }

 backup_pgsql() {
-  if var_true $SPLIT_DB ; then
+  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;' )
+      authdb=${DB_USER}
+      [ -n "${DB_NAME}" ] && authdb=${DB_NAME}
+      DATABASES=$(psql -h $dbhost -U $dbuser -p ${dbport} -d ${authdb} -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}
+                pg_dump -h ${dbhost} -p ${dbport} -U ${dbuser} $db ${EXTRA_OPTS} | $dumpoutput > ${TEMP_LOCATION}/${target}
                exit_code=$?
                generate_md5
                move_backup
            done
-        else
-            export PGPASSWORD=${dbpass}
-            compression
-            pg_dump -h ${dbhost} -U ${dbuser} -p ${dbport} ${dbname} ${EXTRA_OPTS} | $dumpoutput > ${tmpdir}/${target}
-            exit_code=$?
-            generate_md5
-            move_backup
+  else
+      export PGPASSWORD=${dbpass}
+      compression
+      pg_dump -h ${dbhost} -U ${dbuser} -p ${dbport} ${dbname} ${EXTRA_OPTS} | $dumpoutput > ${TEMP_LOCATION}/${target}
+      exit_code=$?
+      generate_md5
+      move_backup
  fi
 }

 backup_redis() {
    target=redis_${db}_${dbhost}_${now}.rdb
-    echo bgsave | redis-cli -h ${dbhost} -p ${dbport} ${REDIS_PASS_STR} --rdb ${tmpdir}/${target} ${EXTRA_OPTS}
+    echo bgsave | redis-cli -h ${dbhost} -p ${dbport} ${REDIS_PASS_STR} --rdb ${TEMP_LOCATION}/${target} ${EXTRA_OPTS}
    print_info "Dumping Redis - Flushing Redis Cache First"
    sleep 10
    try=5
@@ -234,13 +236,16 @@ backup_redis() {
        ok=$(echo 'info Persistence' | redis-cli -h ${dbhost} -p ${dbport} ${REDIS_PASS_STR} | awk '/rdb_last_bgsave_status:ok/{print "ok"}')
        if [[ "$saved" = "saved" ]] && [[ "$ok" = "ok" ]]; then
            print_info "Redis Backup Complete"
+            break
        fi
        try=$((try - 1))
        print_info "Redis Busy - Waiting and retrying in 5 seconds"
        sleep 5
    done
-    generate_md5
+    target_original=${target}
    compression
+    $dumpoutput "${TEMP_LOCATION}/${target_original}"
+    generate_md5
    move_backup
 }

@@ -251,10 +256,10 @@ backup_sqlite3() {
    compression

    print_info "Dumping sqlite3 database: ${dbhost}"
-    sqlite3 "${dbhost}" ".backup '${tmpdir}/backup.sqlite3'"
+    sqlite3 "${dbhost}" ".backup '${TEMP_LOCATION}/backup.sqlite3'"
    exit_code=$?

-    cat "${tmpdir}/backup.sqlite3" | $dumpoutput > "${tmpdir}/${target}"
+    cat "${TEMP_LOCATION}/backup.sqlite3" | $dumpoutput > "${TEMP_LOCATION}/${target}"

    generate_md5
    move_backup
@@ -289,17 +294,11 @@ check_availability() {
        ;;
        "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)"
-                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)"
-                sleep 5
-                (( COUNTER+=5 ))
+            export MYSQL_PWD=${dbpass}
+            while ! (mysqladmin -u"${dbuser}" -P"${dbport}" -h"${dbhost}" status > /dev/null 2>&1) ; do
+              sleep 5
+              (( COUNTER+=5 ))
+              print_warn "MySQL/MariaDB Server '${dbhost}' is not accessible, retrying.. (${COUNTER} seconds so far)"
            done
        ;;
        "mssql" )
@@ -377,7 +376,7 @@ compression() {
 generate_md5() {
 if var_true "$MD5" ; then
    print_notice "Generating MD5 for ${target}"
-    cd $tmpdir
+    cd ${TEMP_LOCATION}
    md5sum "${target}" > "${target}".md5
    MD5VALUE=$(md5sum "${target}" | awk '{ print $1}')
 fi
@@ -397,51 +396,30 @@ move_backup() {
        ;;
    esac
    if [ "$SIZE_VALUE" = "1" ] ; then
-        FILESIZE=$(stat -c%s "${tmpdir}/${target}")
+        FILESIZE=$(stat -c%s "${TEMP_LOCATION}/${target}")
        print_notice "Backup of ${target} created with the size of ${FILESIZE} bytes"
    else
-        FILESIZE=$(du -h "${tmpdir}/${target}" | awk '{ print $1}')
+        FILESIZE=$(du -h "${TEMP_LOCATION}/${target}" | awk '{ print $1}')
        print_notice "Backup of ${target} created with the size of ${FILESIZE}"
    fi

    case "${BACKUP_LOCATION}" in
        "FILE" | "file" | "filesystem" | "FILESYSTEM" )
            mkdir -p "${DB_DUMP_TARGET}"
-            mv ${tmpdir}/*.md5 "${DB_DUMP_TARGET}"/
-            mv ${tmpdir}/"${target}" "${DB_DUMP_TARGET}"/"${target}"
+            mv ${TEMP_LOCATION}/*.md5 "${DB_DUMP_TARGET}"/
+            mv ${TEMP_LOCATION}/"${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
-                s3_url="${S3_BUCKET}.${S3_HOST}"
-            else
-                s3_url="${S3_HOST}/${S3_BUCKET}"
-            fi
+            export AWS_ACCESS_KEY_ID=${S3_KEY_ID}
+            export AWS_SECRET_ACCESS_KEY=${S3_KEY_SECRET}
+            export AWS_DEFAULT_REGION=${S3_REGION}

-            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 \
-                     -H "Date: $date" \
-                     -H "Authorization: AWS ${S3_KEY_ID}:$sig" \
-                     -H "Content-Type: ${s3_content_type}" \
-                     -H "Content-MD5: ${s3_md5}"
-            fi
+            [[ ( -n "${S3_HOST}" ) ]] && PARAM_AWS_ENDPOINT_URL=" --endpoint-url ${S3_PROTOCOL}://${S3_HOST}"

-            s3_date="$(LC_ALL=C date -u +"%a, %d %b %Y %X %z")"
-            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}" \
-                 -H "Date: $s3_date" \
-                 -H "Authorization: AWS ${S3_KEY_ID}:$sig" \
-                 -H "Content-Type: ${s3_content_type}" \
-                 -H "Content-MD5: ${s3_md5}"
+            aws ${PARAM_AWS_ENDPOINT_URL} s3 cp ${TEMP_LOCATION}/${target} s3://${S3_BUCKET}/${S3_PATH}/${target}

-            rm -rf ${tmpdir}/*.md5
-            rm -rf ${tmpdir}/"${target}"
+            rm -rf ${TEMP_LOCATION}/*.md5
+            rm -rf ${TEMP_LOCATION}/"${target}"
        ;;
    esac
 }
@@ -456,15 +434,16 @@ print_debug "Backup routines Initialized on $(date)"
    today=$(date +"%Y%m%d")

    if [[ $DB_DUMP_BEGIN =~ ^\+(.*)$ ]]; then
-            waittime=$(( ${BASH_REMATCH[1]} * 60 ))
+        waittime=$(( ${BASH_REMATCH[1]} * 60 ))
+        target_time=$(($current_time + $waittime))
    else
-            target_time=$(date --date="${today}${DB_DUMP_BEGIN}" +"%s")
+        target_time=$(date --date="${today}${DB_DUMP_BEGIN}" +"%s")
        if [[ "$target_time" < "$current_time" ]]; then
            target_time=$(($target_time + 24*60*60))
        fi
        waittime=$(($target_time - $current_time))
    fi
-
+        print_debug "Wait Time: ${waittime} Target time: ${target_time} Current Time: ${current_time}"
        print_notice "Next Backup at $(date -d @${target_time} +"%Y-%m-%d %T %Z")"
        sleep $waittime
  fi
@@ -473,7 +452,7 @@ print_debug "Backup routines Initialized on $(date)"
 ### Commence Backup
  while true; do
    # make sure the directory exists
-    mkdir -p $tmpdir
+    mkdir -p $TEMP_LOCATION

 ### Define Target name
    now=$(date +"%Y%m%d-%H%M%S")
@@ -518,7 +497,7 @@ print_debug "Backup routines Initialized on $(date)"
        esac

 ### Zabbix
-    if var_true "$ENABLE_ZABBIX" ; then
+    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')"
@@ -548,7 +527,7 @@ print_debug "Backup routines Initialized on $(date)"

    ### Go back to Sleep until next Backup time
    if var_true $MANUAL ; then
-        exit 1;
+        exit 0;
    else
        sleep $(($DB_DUMP_FREQ*60))
    fi
--- a/install/usr/local/bin/backup-now
+++ b/install/usr/local/bin/backup-now
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash

 echo '** Performing Manual Backup'
 /etc/services.available/10-db-backup/run NOW
--- a/zabbix_templates/zabbix_agent_container.xml
+++ b/zabbix_templates/zabbix_agent_container.xml
@@ -1,515 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<zabbix_export>
-    <version>3.4</version>
-    <date>2018-02-02T19:04:27Z</date>
-    <groups>
-        <group>
-            <name>Discovered Containers</name>
-        </group>
-        <group>
-            <name>Templates</name>
-        </group>
-    </groups>
-    <templates>
-        <template>
-            <template>Service - ICMP</template>
-            <name>Service - ICMP (Ping)</name>
-            <description/>
-            <groups>
-                <group>
-                    <name>Templates</name>
-                </group>
-            </groups>
-            <applications>
-                <application>
-                    <name>ICMP</name>
-                </application>
-            </applications>
-            <items>
-                <item>
-                    <name>ICMP ping</name>
-                    <type>3</type>
-                    <snmp_community/>
-                    <snmp_oid/>
-                    <key>icmpping</key>
-                    <delay>1m</delay>
-                    <history>1w</history>
-                    <trends>365d</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts/>
-                    <units/>
-                    <snmpv3_contextname/>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                    <snmpv3_privpassphrase/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description/>
-                    <inventory_link>0</inventory_link>
-                    <applications>
-                        <application>
-                            <name>ICMP</name>
-                        </application>
-                    </applications>
-                    <valuemap>
-                        <name>Service state</name>
-                    </valuemap>
-                    <logtimefmt/>
-                    <preprocessing/>
-                    <jmx_endpoint/>
-                    <master_item/>
-                </item>
-                <item>
-                    <name>ICMP loss</name>
-                    <type>3</type>
-                    <snmp_community/>
-                    <snmp_oid/>
-                    <key>icmppingloss</key>
-                    <delay>1m</delay>
-                    <history>1w</history>
-                    <trends>365d</trends>
-                    <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
-                    <units>%</units>
-                    <snmpv3_contextname/>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                    <snmpv3_privpassphrase/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description/>
-                    <inventory_link>0</inventory_link>
-                    <applications>
-                        <application>
-                            <name>ICMP</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                    <preprocessing/>
-                    <jmx_endpoint/>
-                    <master_item/>
-                </item>
-                <item>
-                    <name>ICMP response time</name>
-                    <type>3</type>
-                    <snmp_community/>
-                    <snmp_oid/>
-                    <key>icmppingsec</key>
-                    <delay>1m</delay>
-                    <history>1w</history>
-                    <trends>365d</trends>
-                    <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
-                    <units>s</units>
-                    <snmpv3_contextname/>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                    <snmpv3_privpassphrase/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description/>
-                    <inventory_link>0</inventory_link>
-                    <applications>
-                        <application>
-                            <name>ICMP</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                    <preprocessing/>
-                    <jmx_endpoint/>
-                    <master_item/>
-                </item>
-            </items>
-            <discovery_rules/>
-            <httptests/>
-            <macros/>
-            <templates/>
-            <screens/>
-        </template>
-        <template>
-            <template>Zabbix - Container Agent</template>
-            <name>Zabbix - Container Agent</name>
-            <description/>
-            <groups>
-                <group>
-                    <name>Discovered Containers</name>
-                </group>
-                <group>
-                    <name>Templates</name>
-                </group>
-            </groups>
-            <applications>
-                <application>
-                    <name>Packages</name>
-                </application>
-                <application>
-                    <name>Zabbix agent</name>
-                </application>
-            </applications>
-            <items>
-                <item>
-                    <name>Hostname of Container</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <snmp_oid/>
-                    <key>agent.hostname</key>
-                    <delay>1h</delay>
-                    <history>1w</history>
-                    <trends>0</trends>
-                    <status>0</status>
-                    <value_type>1</value_type>
-                    <allowed_hosts/>
-                    <units/>
-                    <snmpv3_contextname/>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                    <snmpv3_privpassphrase/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description/>
-                    <inventory_link>3</inventory_link>
-                    <applications>
-                        <application>
-                            <name>Zabbix agent</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                    <preprocessing/>
-                    <jmx_endpoint/>
-                    <master_item/>
-                </item>
-                <item>
-                    <name>Contaner OS</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <snmp_oid/>
-                    <key>agent.os</key>
-                    <delay>6h</delay>
-                    <history>30d</history>
-                    <trends>0</trends>
-                    <status>0</status>
-                    <value_type>1</value_type>
-                    <allowed_hosts/>
-                    <units/>
-                    <snmpv3_contextname/>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                    <snmpv3_privpassphrase/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description/>
-                    <inventory_link>5</inventory_link>
-                    <applications>
-                        <application>
-                            <name>Zabbix agent</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                    <preprocessing/>
-                    <jmx_endpoint/>
-                    <master_item/>
-                </item>
-                <item>
-                    <name>Zabbix Agent ping</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <snmp_oid/>
-                    <key>agent.ping</key>
-                    <delay>1m</delay>
-                    <history>1w</history>
-                    <trends>365d</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts/>
-                    <units/>
-                    <snmpv3_contextname/>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                    <snmpv3_privpassphrase/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description>The agent always returns 1 for this item. It could be used in combination with nodata() for availability check.</description>
-                    <inventory_link>0</inventory_link>
-                    <applications>
-                        <application>
-                            <name>Zabbix agent</name>
-                        </application>
-                    </applications>
-                    <valuemap>
-                        <name>Zabbix agent ping status</name>
-                    </valuemap>
-                    <logtimefmt/>
-                    <preprocessing/>
-                    <jmx_endpoint/>
-                    <master_item/>
-                </item>
-                <item>
-                    <name>Zabbix Agent Version</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <snmp_oid/>
-                    <key>agent.version</key>
-                    <delay>1h</delay>
-                    <history>1w</history>
-                    <trends>0</trends>
-                    <status>0</status>
-                    <value_type>1</value_type>
-                    <allowed_hosts/>
-                    <units/>
-                    <snmpv3_contextname/>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                    <snmpv3_privpassphrase/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description/>
-                    <inventory_link>0</inventory_link>
-                    <applications>
-                        <application>
-                            <name>Zabbix agent</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                    <preprocessing/>
-                    <jmx_endpoint/>
-                    <master_item/>
-                </item>
-                <item>
-                    <name>Upgradable Packages</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <snmp_oid/>
-                    <key>packages.upgradable</key>
-                    <delay>6h</delay>
-                    <history>90d</history>
-                    <trends>365d</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts/>
-                    <units/>
-                    <snmpv3_contextname/>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                    <snmpv3_privpassphrase/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description/>
-                    <inventory_link>0</inventory_link>
-                    <applications>
-                        <application>
-                            <name>Packages</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                    <preprocessing/>
-                    <jmx_endpoint/>
-                    <master_item/>
-                </item>
-            </items>
-            <discovery_rules/>
-            <httptests/>
-            <macros/>
-            <templates/>
-            <screens/>
-        </template>
-    </templates>
-    <triggers>
-        <trigger>
-            <expression>{Service - ICMP:icmpping.max(3m)}=3</expression>
-            <recovery_mode>0</recovery_mode>
-            <recovery_expression/>
-            <name>Cannot be pinged</name>
-            <correlation_mode>0</correlation_mode>
-            <correlation_tag/>
-            <url/>
-            <status>0</status>
-            <priority>5</priority>
-            <description/>
-            <type>0</type>
-            <manual_close>0</manual_close>
-            <dependencies/>
-            <tags/>
-        </trigger>
-        <trigger>
-            <expression>{Service - ICMP:icmppingloss.min(10m)}&gt;50</expression>
-            <recovery_mode>0</recovery_mode>
-            <recovery_expression/>
-            <name>Ping loss is too high</name>
-            <correlation_mode>0</correlation_mode>
-            <correlation_tag/>
-            <url/>
-            <status>0</status>
-            <priority>4</priority>
-            <description/>
-            <type>0</type>
-            <manual_close>0</manual_close>
-            <dependencies>
-                <dependency>
-                    <name>Cannot be pinged</name>
-                    <expression>{Service - ICMP:icmpping.max(3m)}=3</expression>
-                    <recovery_expression/>
-                </dependency>
-            </dependencies>
-            <tags/>
-        </trigger>
-        <trigger>
-            <expression>{Service - ICMP:icmppingsec.avg(2m)}&gt;100</expression>
-            <recovery_mode>0</recovery_mode>
-            <recovery_expression/>
-            <name>Ping Response time is too high</name>
-            <correlation_mode>0</correlation_mode>
-            <correlation_tag/>
-            <url/>
-            <status>0</status>
-            <priority>4</priority>
-            <description/>
-            <type>1</type>
-            <manual_close>0</manual_close>
-            <dependencies>
-                <dependency>
-                    <name>Cannot be pinged</name>
-                    <expression>{Service - ICMP:icmpping.max(3m)}=3</expression>
-                    <recovery_expression/>
-                </dependency>
-            </dependencies>
-            <tags/>
-        </trigger>
-        <trigger>
-            <expression>{Zabbix - Container Agent:packages.upgradable.last()}&gt;0</expression>
-            <recovery_mode>0</recovery_mode>
-            <recovery_expression/>
-            <name>Upgraded Packages in Container Available</name>
-            <correlation_mode>0</correlation_mode>
-            <correlation_tag/>
-            <url/>
-            <status>0</status>
-            <priority>1</priority>
-            <description/>
-            <type>0</type>
-            <manual_close>0</manual_close>
-            <dependencies/>
-            <tags/>
-        </trigger>
-        <trigger>
-            <expression>{Zabbix - Container Agent:agent.ping.nodata(3m)}=1</expression>
-            <recovery_mode>0</recovery_mode>
-            <recovery_expression/>
-            <name>Zabbix agent is unreachable</name>
-            <correlation_mode>0</correlation_mode>
-            <correlation_tag/>
-            <url/>
-            <status>0</status>
-            <priority>5</priority>
-            <description/>
-            <type>0</type>
-            <manual_close>0</manual_close>
-            <dependencies/>
-            <tags/>
-        </trigger>
-    </triggers>
-    <value_maps>
-        <value_map>
-            <name>Service state</name>
-            <mappings>
-                <mapping>
-                    <value>0</value>
-                    <newvalue>Down</newvalue>
-                </mapping>
-                <mapping>
-                    <value>1</value>
-                    <newvalue>Up</newvalue>
-                </mapping>
-            </mappings>
-        </value_map>
-        <value_map>
-            <name>Zabbix agent ping status</name>
-            <mappings>
-                <mapping>
-                    <value>1</value>
-                    <newvalue>Up</newvalue>
-                </mapping>
-            </mappings>
-        </value_map>
-    </value_maps>
-</zabbix_export>
Author	SHA1	Message	Date
Dave Conroy	c515e2aaa0	Release 2.11.4 - See CHANGELOG.md	2022-03-15 10:29:37 -07:00
Dave Conroy	e5dea03d9e	Github Workflow fix	2022-03-01 16:11:30 -08:00
Dave Conroy	31e4487827	Update github configuration	2022-02-10 09:28:38 -08:00
Dave Conroy	fa1dde53c0	Release 2.11.3 - See CHANGELOG.md	2022-02-09 19:34:27 -08:00
Dave Conroy	789a9e5f5a	Release 2.11.2 - See CHANGELOG.md	2022-02-09 17:14:25 -08:00
Dave Conroy	b80d61f997	Merge pull request #102 from jacksgt/fix-s3-variable Fix S3 variables (again)	2022-02-08 13:58:33 -08:00
Jack Henschel	9e23def7b4	Fix S3 variables (again) S3_ENDPOINT is not used anywhere in the code, but S3_HOST.	2022-02-08 21:52:53 +01:00
Dave Conroy	ca31eb840d	2.11.1 - See CHANGELOG.md	2022-02-06 17:03:36 -08:00
Dave Conroy	6bec188633	Merge pull request #101 from jacksgt/add-s3-endpoint Correct several variables for S3 backups	2022-02-06 17:01:18 -08:00
Dave Conroy	43562077b0	Merge pull request #100 from jacksgt/patch-1 Use exit code 0 when running in manual mode	2022-02-06 16:59:00 -08:00
Jack Henschel	c39bdeebae	Correct several variables for S3 backups * S3_URI_STYLE is not used anywhere (anymore) * BACKUP_TYPE is not documented anywhere, redundant with BACKUP_LOCATION * S3_HOST is not used anymore, document S3_ENDPOINT instead ref `4d6419fd18`	2022-02-06 00:50:35 +01:00
Jack Henschel	36b5909483	Use exit code 0 when running in manual mode When running this container as a Kubernetes cronjob, it is really inconvenient that the script exits with return code "1", thereby marking the job as a failure. Instead, the script should return "0" because everything was successful.	2022-02-06 00:20:30 +01:00
Dave Conroy	6033b1b0a9	Update README to talk about quoting the values	2022-01-31 13:59:53 -08:00
Dave Conroy	88218915e1	Release 2.11.0 - See CHANGELOG.md	2022-01-20 09:23:06 -08:00
Dave Conroy	065887f789	Release 2.10.3 - See CHANGELOG.md	2022-01-07 06:33:46 -08:00
Dave Conroy	5aba713b73	Release 2.10.2 - See CHANGELOG.md	2021-12-28 14:16:46 -08:00
Dave Conroy	9a6039d71d	Release 2.10.1 - See CHANGELOG.md	2021-12-24 17:43:18 -08:00
Dave Conroy	c5f1618231	Merge pull request #93 from milenkara/master Provide region when using S3	2021-12-24 17:42:16 -08:00
milenkara	7dd9fa890f	Provide region when using S3	2021-12-24 16:26:03 +01:00
Dave Conroy	b62554ceff	Release 2.10.0 - See CHANGELOG.md	2021-12-22 14:29:35 -08:00
Dave Conroy	7729743ccf	Release 2.9.7 - See CHANGELOG.md	2021-12-15 07:17:57 -08:00
Dave Conroy	d56efc0ee9	Release 2.9.6 - See CHANGELOG.md	2021-12-13 17:40:43 -08:00
Dave Conroy	7d87e474e0	Merge branch 'master' of https://github.com/tiredofit/docker-db-backup	2021-12-13 17:38:25 -08:00
Dave Conroy	342c252d9a	Release 2.9.5 - See CHANGELOG.md	2021-12-13 17:33:14 -08:00
Dave Conroy	25f3cab21f	Merge pull request #91 from alexbarcelo/minio_fix MINIO support by reacting to S3_HOST	2021-12-13 17:30:50 -08:00
Dave Conroy	e63d56c753	Merge pull request #92 from alexbarcelo/targettimeprint Fixing the print_notice for Next Backup when `DB_DUMP_BEGIN` is +XXX	2021-12-13 17:27:58 -08:00
Alex Barcelo	86722a8e8a	defining target_time variable in that branch	2021-12-13 21:56:45 +01:00
Alex Barcelo	4d6419fd18	reacting to S3_HOST config envvar by setting the --endpoint-url parameter on AWS CLI	2021-12-13 21:49:02 +01:00
Dave Conroy	99153ac6d1	Release 2.9.5	2021-12-07 15:10:28 -08:00
Dave Conroy	142967135d	Release 2.9.4 - See CHANGELOG.md	2021-12-07 15:02:47 -08:00
Dave Conroy	1df66853fb	Release 2.9.3 - See CHANGELOG.md	2021-11-24 09:53:49 -08:00
Dave Conroy	c019efeb74	Release 2.9.2 - See CHANGELOG.md	2021-10-22 07:12:05 -07:00
Dave Conroy	f276af2512	Merge pull request #86 from teenigma/backup-redis Fix compression on Redis backup - Fixes #58	2021-10-22 07:10:00 -07:00
Teerapatr K	4e41e66eff	Fix compression on Redis backup file	2021-10-22 14:06:37 +07:00
Teerapatr K	4488d113ef	Jump out loop when complete	2021-10-22 14:04:54 +07:00
Dave Conroy	1cd014b165	Add manual CI pipeline	2021-10-17 09:41:53 -07:00
Dave Conroy	39bd8537ff	Add manual CI pipeline	2021-10-17 09:41:18 -07:00
Dave Conroy	75ded7599c	Release 2.9.1 - See CHANGELOG.md	2021-10-15 16:27:19 -07:00
Dave Conroy	5e5986db69	Merge pull request #83 from sbrunecker/bug/79/fix-mysql-8 fix: not able to connect to mysql 8 db with caching_sha2_password	2021-10-15 16:25:20 -07:00
Dave Conroy	1d61f40d0c	Release 2.9.1 - See CHANGELOG.md	2021-10-15 16:24:46 -07:00
Dave Conroy	ee8bbb370b	Merge pull request #84 from sbrunecker/bug/80/empty-password fix: db available check getting stuck with empty password	2021-10-15 16:23:26 -07:00
Stefan Brunecker	ae201814fa	fix: db available check getting stuck with empty password	2021-10-16 00:50:15 +02:00
Stefan Brunecker	bf8bce0893	fix: not able to connect to mysql 8 db with caching_sha2_password	2021-10-16 00:49:27 +02:00
Dave Conroy	3e8585394d	Release 2.9.0 - See CHANGELOG.md	2021-10-15 10:08:27 -07:00
Dave Conroy	2e0c0d9248	Release 2.8.2 - See CHANGELOG.md	2021-10-15 09:52:25 -07:00
Dave Conroy	c81d8e2713	Release 2.8.1 - See CHANGELOG.md	2021-09-01 07:43:01 -07:00
Dave Conroy	b808b35624	Release 2.8.0 - See CHANGELOG.md	2021-08-27 07:22:59 -07:00
Dave Conroy	e060aeb0e5	Merge pull request #70 from the1ts/master Fix syntax error - Issue #69	2021-06-22 08:26:58 -07:00
Paul Mansfield	03c16cc582	Fix syntax error Case statement is missing double semi-colon.	2021-06-22 14:06:07 +01:00
Dave Conroy	e45d916b00	Release 2.7.0 - See CHANGELOG.md	2021-06-17 08:45:57 -07:00
Dave Conroy	eb0ee61662	Mongo DB Authentication Database	2021-06-17 07:22:38 -07:00
Dave Conroy	8e737eb579	Update to Alpine 3.14	2021-06-17 07:17:34 -07:00
Dave Conroy	5d2043a603	Merge pull request #63 from james-song/master Fixed #62	2021-06-12 09:03:41 -07:00
Dave Conroy	89fe251321	Update CHANGELOG.md	2021-06-08 14:16:31 -07:00
Dave Conroy	e9052f1cd6	Release 2.6.1 - See CHANGELOG.md	2021-06-08 13:36:22 -07:00
Dave Conroy	a73528c5b2	Merge pull request #66 from jwillmer/patch-1 Fix for issue #14 - Use db_name in query	2021-06-08 13:33:35 -07:00
Jens Willmer	7d1e112dfc	Fix for issue #14 - Use db_name in query As pointed out by @wglambert the db_name needs to be specified when POSTGRES_DB was set: https://github.com/docker-library/postgres/issues/854#issuecomment-856877311	2021-06-08 22:10:58 +02:00
Dave Conroy	e0bb4c313b	Merge pull request #65 from MadWalnut/master Fix Docker image name and URL	2021-06-01 16:22:32 -07:00
MadWalnut	cb5333a59c	Fix Docker image name and URL	2021-06-02 00:34:00 +02:00
Dave Conroy	7b59632378	Update README	2021-05-27 08:40:48 -07:00
james-song	353b1af7b4	Fixed #62 , for upload backup files at S3 using awscli	2021-05-10 16:13:21 +09:00
Dave Conroy	a27b46a43a	Update README	2021-05-02 16:18:28 -07:00
Dave Conroy	e5b9ee2cc0	Add Issue Templates	2021-05-02 14:48:24 -07:00
Dave Conroy	6ddb749bc6	Add Issue Templates	2021-05-02 14:47:56 -07:00
Dave Conroy	fb299c41dd	Update README.md	2021-03-15 17:48:00 -07:00