Release 2.7.0 - See CHANGELOG.md

CHANGELOG.md

@@ -1,19 +1,3 @@
-## 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

Dockerfile

@@ -1,11 +1,11 @@
-FROM tiredofit/alpine:3.14
+FROM tiredofit/alpine:3.13
 
 ### Set Environment Variables
 ENV MSSQL_VERSION=17.5.2.1-1 \
-    CONTAINER_ENABLE_SCHEDULING=FALSE \
-    CONTAINER_ENABLE_MESSAGING=FALSE \
-    CONTAINER_ENABLE_MONITORING=TRUE \
-    CONTAINER_NAME=db-backup
+    ENABLE_CRON=FALSE \
+    ENABLE_SMTP=FALSE \
+    ENABLE_ZABBIX=TRUE \
+    ZABBIX_HOSTNAME=db-backup
 
     ### Dependencies
 RUN set -ex && \
@@ -16,7 +16,6 @@ RUN set -ex && \
                bzip2-dev \
                git \
                libarchive-dev \
-               py3-pip \
                xz-dev \
                && \
     \
@@ -30,7 +29,6 @@ RUN set -ex && \
                pigz \
                postgresql \
                postgresql-client \
-               python3 \
                redis \
                sqlite \
                xz \
@@ -59,13 +57,17 @@ RUN set -ex && \
         && \
      make && \
      make install && \
-    pip3 install --upgrade pip && \
-    pip3 install awscli && \
      \
 ### Cleanup
     apk del .db-backup-build-deps && \
     rm -rf /usr/src/* && \
-    rm -rf /root/.cache /tmp/* /var/cache/apk/*
+    rm -rf /tmp/* /var/cache/apk/*
+
+RUN apk add --no-cache \
+               python3 \
+               py3-pip \
+          && pip3 install --upgrade pip \
+          && pip3 install awscli
 
 ### S6 Setup
     ADD install  /

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

@@ -35,7 +35,6 @@ case "$dbtype" in
         dbport=${DB_PORT:-27017}
         [[ ( -n "${DB_USER}" ) || ( -n "${DB_USER_FILE}" ) ]] && file_env 'DB_USER'
         [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
-    ;;
     "mysql" | "MYSQL" | "mariadb" | "MARIADB")
         dbtype=mysql
         dbport=${DB_PORT:-3306}
@@ -497,7 +496,7 @@ print_debug "Backup routines Initialized on $(date)"
         esac
 
 ### Zabbix
-    if var_true "$CONTAINER_ENABLE_MONITORING}" ; then
+    if var_true "$ENABLE_ZABBIX" ; then
         print_notice "Sending Backup Statistics to Zabbix"
         silent zabbix_sender -c /etc/zabbix/zabbix_agentd.conf -k dbbackup.size -o "$(stat -c%s "${DB_DUMP_TARGET}"/"${target}")"
         silent zabbix_sender -c /etc/zabbix/zabbix_agentd.conf -k dbbackup.datetime -o "$(date -r  "${DB_DUMP_TARGET}"/"${target}" +'%s')"