Release 2.5.0 - See CHANGELOG.md

#51 Fix backup of multiple InfluxDB databases failure

.github/workflows/main.yml

@@ -0,0 +1,113 @@
+### Application Level Image CI
+### Dave Conroy <dave at tiredofit dot ca>
+
+name: 'Build Images'
+
+on:
+  push:
+    paths:
+    - '**'
+    - '!README.md'
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/}
+          set -x
+          if [[ $GITHUB_REF == refs/heads/* ]]; then
+             if [[ $GITHUB_REF == refs/heads/*/* ]] ; then
+               BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
+             else
+               BRANCH=${GITHUB_REF#refs/heads/}
+             fi
+
+            case ${BRANCH} in
+              "main" | "master" )
+                  BRANCHTAG="${DOCKER_IMAGE}:latest"
+                ;;
+              "develop" )
+                  BRANCHTAG="${DOCKER_IMAGE}:develop"
+                ;;
+              * )
+                  if [ -n "${{ secrets.LATEST }}" ] ; then
+                    if [ "${BRANCHTAG}" = "${{ secrets.LATEST }}" ]; then
+                      BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest,${DOCKER_IMAGE}:latest"
+                    else
+                      BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest"
+                    fi
+                  else
+                    BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest"
+                  fi
+                ;;
+            esac
+          fi
+
+
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+               GITTAG="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed 's|refs/tags/||g')"
+          fi
+
+          if [ -n "${BRANCHTAG}" ] && [ -n "${GITTAG}" ]; then
+            TAGS=${BRANCHTAG},${GITTAG}
+          else
+            TAGS="${BRANCHTAG}${GITTAG}"
+          fi
+
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=docker_image::${DOCKER_IMAGE}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        run: |
+             docker buildx inspect --bootstrap
+
+
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Label
+        id: Label
+        run: |
+          if [ -f "Dockerfile" ] ; then
+            sed -i "/FROM .*/a LABEL tiredofit.image.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" Dockerfile
+            sed -i "/FROM .*/a LABEL tiredofit.image.git_commit=\"${GITHUB_SHA}\"" Dockerfile
+            sed -i "/FROM .*/a LABEL tiredofit.image.git_committed_by=\"${GITHUB_ACTOR}\"" Dockerfile
+            sed -i "/FROM .*/a LABEL tiredofit.image.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile
+            if [ -f "CHANGELOG.md" ] ; then
+              sed -i "/FROM .*/a LABEL tiredofit.image.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile
+            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/v6,linux/arm/v7,linux/arm64
+          push: true
+          tags: ${{ steps.prep.outputs.tags }}

CHANGELOG.md

@@ -1,3 +1,48 @@
+## 2.5.0 2021-01-25 <dave at tiredofit dot ca>
+
+   ### Added
+      - Multi Platform Build Variants (ARMv7 AMD64 AArch64)
+
+   ### Changed
+      - Alpine 3.13 Base
+      - Compile Pixz as opposed to relying on testing repository
+      - MSSQL Support only available under AMD64. Container exits if any other platform detected when MSSQL set to be backed up.
+
+## 2.4.0 2020-12-07 <dave at tiredofit dot ca>
+
+   ### Added
+      - Switch back to packges for Postgresql (now 13.1)
+
+
+## 2.3.2 2020-11-14 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Reapply S6-Overlay into filesystem as Postgresql build is removing S6 files due to edge containing S6 overlay
+
+
+## 2.3.1 2020-11-11 <bambi73@github>
+
+   ### Fixed
+      - Multiple Influx DB's not being backed up correctly
+
+## 2.3.0 2020-10-15 <dave at tiredofit dot ca>
+
+   ### Added
+      - Microsoft SQL Server support (experimental)
+
+   ### Changed
+      - Compiled Postgresql 13 from source to backup psql/13 hosts
+
+## 2.2.2 2020-09-22 <tpansino@github>
+
+   ### Fixed
+      - Patch for 2.2.0 release fixing Docker Secrets Support. Was skipping password check.
+
+## 2.2.1 2020-09-17 <alwynpan@github>
+
+   ### Fixed
+      - Ondemand/Manual backup with `backup-now` was throwing errors not being able to find a proper date
+
 ## 2.2.0 2020-09-14 <alwynpan@github>
 
    ### Fixed

Dockerfile

@@ -1,21 +1,21 @@
-FROM tiredofit/alpine:edge
-LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
+FROM tiredofit/alpine:3.13
 
 ### Set Environment Variables
-ENV ENABLE_CRON=FALSE \
+ENV MSSQL_VERSION=17.5.2.1-1 \
+    ENABLE_CRON=FALSE \
     ENABLE_SMTP=FALSE \
     ENABLE_ZABBIX=TRUE \
     ZABBIX_HOSTNAME=db-backup
 
-### Dependencies
+    ### Dependencies
 RUN set -ex && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
     apk update && \
     apk upgrade && \
     apk add -t .db-backup-build-deps \
                build-base \
                bzip2-dev \
                git \
+               libarchive-dev \
                xz-dev \
                && \
     \
@@ -33,16 +33,29 @@ RUN set -ex && \
                zstd \
                && \
     \
-    apk add --no-cache \
-               pixz@testing \
-               && \
+    cd /usr/src && \
     \
+    apkArch="$(apk --print-arch)"; \
+    case "$apkArch" in \
+	x86_64) mssql=true ; curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MSSQL_VERSION}_amd64.apk ; curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/mssql-tools_${MSSQL_VERSION}_amd64.apk ; echo y | apk add --allow-untrusted msodbcsql17_${MSSQL_VERSION}_amd64.apk mssql-tools_${MSSQL_VERSION}_amd64.apk ;; \
+	*) echo >&2 "Detected non x86_64 build variant, skipping MSSQL installation" ;; \
+    esac; \
     mkdir -p /usr/src/pbzip2 && \
-    curl -ssL https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz | tar xvfz - --strip=1 -C /usr/src/pbzip2 && \
+    curl -sSL https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz | tar xvfz - --strip=1 -C /usr/src/pbzip2 && \
     cd /usr/src/pbzip2 && \
     make && \
     make install && \
-    \
+    mkdir -p /usr/src/pixz && \
+    curl -sSL https://github.com/vasi/pixz/releases/download/v1.0.7/pixz-1.0.7.tar.xz | tar xvfJ - --strip 1 -C /usr/src/pixz && \
+    cd /usr/src/pixz && \
+    ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        && \
+     make && \
+     make install && \
+     \
 ### Cleanup
     apk del .db-backup-build-deps && \
     rm -rf /usr/src/* && \

README.md

@@ -32,28 +32,29 @@ Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers.
 
 ## Table of Contents
 
-- [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)
+- [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)
 
 ## Prerequisites
 
@@ -90,8 +91,6 @@ The following directories are used for configuration and can be mapped for persi
 
 ### Environment Variables
 
-*If you are trying to backup a database that doesn't have a user or a password (you should!) make sure you set `CONTAINER_ENABLE_DOCKER_SECRETS=FALSE`*
-
 Along with the Environment Variables from the [Base image](https://hub.docker.com/r/tiredofit/alpine), below is the complete list of available options that can be used to customize your installation.
 
 | Parameter              | Description                                                                                                                                                                                        |

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

@@ -33,23 +33,32 @@ case "$dbtype" in
     "mongo" | "mongodb" | "MONGO" | "MONGODB" )
         dbtype=mongo
         dbport=${DB_PORT:-27017}
-        [[ ( -n "${DB_USER}" ) ]] && file_env 'DB_USER'
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_USER}" ) || ( -n "${DB_USER_FILE}" ) ]] && file_env 'DB_USER'
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
     ;;
     "mysql" | "MYSQL" | "mariadb" | "MARIADB")
         dbtype=mysql
         dbport=${DB_PORT:-3306}
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
+    ;;
+    "mssql" | "MSSQL" | "microsoftsql" | "MICROSOFTSQL")
+        apkArch="$(apk --print-arch)"; \
+	    case "$apkArch" in
+		    x86_64) mssql=true ;;
+		    *) print_error "MSSQL cannot operate on $apkArch processor!" ; exit 1 ;;
+        esac
+        dbtype=mssql
+        dbport=${DB_PORT:-1433}
     ;;
     "postgres" | "postgresql" | "pgsql" | "POSTGRES" | "POSTGRESQL" | "PGSQL" )
         dbtype=pgsql
         dbport=${DB_PORT:-5432}
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
     ;;
     "redis" | "REDIS"   )
         dbtype=redis
         dbport=${DB_PORT:-6379}
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_PASS}" || ( -n "${DB_PASS_FILE}" ) ) ]] && file_env 'DB_PASS'
     ;;
 esac
 
@@ -128,6 +137,42 @@ backup_couch() {
     move_backup
 }
 
+backup_influx() {
+    if [ "${COMPRESSION}" = "NONE" ] || [ "${COMPRESSION}" = "none" ] || [ "${COMPRESSION}" = "FALSE" ] || [ "${COMPRESSION}" = "false" ] ; then
+        :
+    else
+        print_notice "Compressing InfluxDB backup with gzip"
+        influx_compression="-portable"
+    fi
+    for DB in $DB_NAME; do
+        target=influx_${DB}_${dbhost}_${now}
+        influxd backup ${influx_compression} -database $DB -host ${dbhost}:${dbport} ${tmpdir}/${target}
+        exit_code=$?
+        generate_md5
+        move_backup
+    done
+}
+
+backup_mongo() {
+    if [ "${COMPRESSION}" = "NONE" ] || [ "${COMPRESSION}" = "none" ] || [ "${COMPRESSION}" = "FALSE" ] || [ "${COMPRESSION}" = "false" ] ; then
+        target=${dbtype}_${dbname}_${dbhost}_${now}.archive
+    else
+        print_notice "Compressing MongoDB backup with gzip"
+        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}
+    exit_code=$?
+    cd ${tmpdir}
+    generate_md5
+    move_backup
+}
+
+backup_mssql() {
+    target=mssql_${dbname}_${dbhost}_${now}.bak
+    /opt/mssql-tools/bin/sqlcmd -E -C -S ${dbhost}\,${dbport} -U ${dbuser} -P ${dbpass} –Q "BACKUP DATABASE \[${dbname}\] TO DISK = N'${tmpdir}/${target}' WITH NOFORMAT, NOINIT, NAME = '${dbname}-full', SKIP, NOREWIND, NOUNLOAD, STATS = 10"
+}
+
 backup_mysql() {
     if var_true "$SPLIT_DB" ; then
         DATABASES=$(mysql -h ${dbhost} -P $dbport -u$dbuser --batch -e "SHOW DATABASES;" | grep -v Database|grep -v schema)
@@ -152,36 +197,6 @@ backup_mysql() {
     fi
 }
 
-backup_influx() {
-    if [ "${COMPRESSION}" = "NONE" ] || [ "${COMPRESSION}" = "none" ] || [ "${COMPRESSION}" = "FALSE" ] || [ "${COMPRESSION}" = "false" ] ; then
-        :
-    else
-        print_notice "Compressing InfluxDB backup with gzip"
-        influx_compression="-portable"
-    fi
-    for DB in $DB_NAME; do
-        influxd backup ${influx_compression} -database $DB -host ${dbhost}:${dbport} ${tmpdir}/${target}
-        exit_code=$?
-        generate_md5
-        move_backup
-    done
-}
-
-backup_mongo() {
-    if [ "${COMPRESSION}" = "NONE" ] || [ "${COMPRESSION}" = "none" ] || [ "${COMPRESSION}" = "FALSE" ] || [ "${COMPRESSION}" = "false" ] ; then
-        target=${dbtype}_${dbname}_${dbhost}_${now}.archive
-    else
-        print_notice "Compressing MongoDB backup with gzip"
-        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}
-    exit_code=$?
-    cd ${tmpdir}
-    generate_md5
-    move_backup
-}
-
 backup_pgsql() {
   if var_true $SPLIT_DB ; then
       export PGPASSWORD=${dbpass}
@@ -268,6 +283,14 @@ check_availability() {
                 (( COUNTER+=5 ))
             done
         ;;
+        "mssql" )
+            COUNTER=0
+            while ! (nc -z ${dbhost} ${dbport}) ; do
+                sleep 5
+                (( COUNTER+=5 ))
+                print_warn "MSSQL Host '${dbhost}' is not accessible, retrying.. ($COUNTER seconds so far)"
+            done
+        ;;
         "pgsql" )
             COUNTER=0
             export PGPASSWORD=${dbpass}
@@ -394,21 +417,23 @@ move_backup() {
 print_debug "Backup routines Initialized on $(date)"
 
 ### Wait for Next time to start backup
-  current_time=$(date +"%s")
-  today=$(date +"%Y%m%d")
+  if [ "$1" != "NOW" ]; then
+    current_time=$(date +"%s")
+    today=$(date +"%Y%m%d")
 
-  if [[ $DB_DUMP_BEGIN =~ ^\+(.*)$ ]]; then
-        waittime=$(( ${BASH_REMATCH[1]} * 60 ))
-  else
-        target_time=$(date --date="${today}${DB_DUMP_BEGIN}" +"%s")
-    if [[ "$target_time" < "$current_time" ]]; then
-        target_time=$(($target_time + 24*60*60))
+    if [[ $DB_DUMP_BEGIN =~ ^\+(.*)$ ]]; then
+            waittime=$(( ${BASH_REMATCH[1]} * 60 ))
+    else
+            target_time=$(date --date="${today}${DB_DUMP_BEGIN}" +"%s")
+        if [[ "$target_time" < "$current_time" ]]; then
+            target_time=$(($target_time + 24*60*60))
+        fi
+        waittime=$(($target_time - $current_time))
     fi
-  waittime=$(($target_time - $current_time))
-  fi
 
-  print_notice "Next Backup at $(date -d @${target_time} +"%Y-%m-%d %T %Z")"
-  sleep $waittime
+        print_notice "Next Backup at $(date -d @${target_time} +"%Y-%m-%d %T %Z")"
+        sleep $waittime
+  fi
 
 
 ### Commence Backup
@@ -432,6 +457,10 @@ print_debug "Backup routines Initialized on $(date)"
             check_availability
             backup_influx
         ;;
+        "mssql" )
+            check_availability
+            backup_mssql
+        ;;
         "mysql" )
             check_availability
             backup_mysql