Release 4.1.14 - See CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,39 @@
+## 4.1.14 2025-01-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Downgrade AWS Client to 1.36.40 due to incompatibilities with providers with 1.37x. for time being
+
+
+## 4.1.13 2025-01-21 <dave at tiredofit dot ca>
+
+   ### Added
+      - Update MySQL client to 8.4.4
+      - Update AWS Client to 1.37.2
+
+   ### Changed
+      - Seperate MySQL and MariaDB TLS Configurationf for arguments that have deviated
+
+
+## 4.1.12 2024-12-13 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for 4.1.11
+
+
+## 4.1.11 2024-12-13 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix when backing up 'ALL' databases with MariaDB
+
+
+## 4.1.10 2024-12-12 <dave at tiredofit dot ca>
+
+   ### Added
+      - Use tiredofit/alpine:3.21-7.10.27 base
+      - Use the actual binary name when dumping mariadb and mysql databases
+      - Silence warnings that are appearing due to filenames, ssl warnings re MariaDB / MySQL
+
+
 ## 4.1.9 2024-11-07 <dave at tiredofit dot ca>
 
    ### Added

Dockerfile

@@ -1,5 +1,5 @@
 ARG DISTRO=alpine
-ARG DISTRO_VARIANT=edge-7.10.19
+ARG DISTRO_VARIANT=3.21-7.10.27
 
 FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
@@ -8,9 +8,9 @@ ENV INFLUX1_CLIENT_VERSION=1.8.0 \
     INFLUX2_CLIENT_VERSION=2.7.5 \
     MSODBC_VERSION=18.4.1.1-1 \
     MSSQL_VERSION=18.4.1.1-1 \
-    MYSQL_VERSION=mysql-8.4.3 \
+    MYSQL_VERSION=mysql-8.4.4 \
     MYSQL_REPO_URL=https://github.com/mysql/mysql-server \
-    AWS_CLI_VERSION=1.35.13 \
+    AWS_CLI_VERSION=1.36.40 \
     CONTAINER_ENABLE_MESSAGING=TRUE \
     CONTAINER_ENABLE_MONITORING=TRUE \
     IMAGE_NAME="tiredofit/db-backup" \

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 Dave Conroy
+Copyright (c) 2025 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

install/assets/functions/10-db-backup

@@ -413,9 +413,11 @@ EOF
                 case "${backup_job_mysql_client,,}" in
                     mariadb )
                         _mysql_prefix=/usr/bin/
+                        _mysql_bin_prefix=mariadb-
                     ;;
                     mysql )
                         _mysql_prefix=/opt/mysql/bin/
+                        _mysql_bin_prefix=mysql
                     ;;
                     * )
                         print_error "I don't understand '${backup_job_mysql_client,,}' as a client. Exiting.."
@@ -427,6 +429,14 @@ EOF
 
                 if [ -n "${backup_job_db_pass}" ] ; then export MYSQL_PWD=${backup_job_db_pass} ; fi
                 if var_true "${backup_job_mysql_enable_tls}" ; then
+                    case "${backup_job_mysql_client,,}" in
+                        mariadb )
+                            mysql_tls_args="--ssl"
+                        ;;
+                        mysql )
+                            mysql_tls_args="--ssl-mode=REQUIRED"
+                        ;;
+                    esac
                     if [ -n "${backup_job_mysql_tls_ca_file}" ] ; then
                         mysql_tls_args="--ssl_ca=${backup_job_mysql_tls_ca_file}"
                     fi
@@ -438,12 +448,28 @@ EOF
                     fi
 
                     if var_true "${backup_job_mysql_tls_verify}" ; then
-                        mysql_tls_args="${mysql_tls_args} --sslverify-server-cert"
+                        case "${backup_job_mysql_client,,}" in
+                            mariadb )
+                                mysql_tls_args="${mysql_tls_args} --sslverify-server-cert"
+                            ;;
+                            mysql )
+                                mysql_tls_args="${mysql_tls_args} --ssl-mode=VERIFY_CA"
+                            ;;
+                        esac
                     fi
 
                     if [ -n "${backup_job_mysql_tls_version}" ] ; then
                         mysql_tls_args="${mysql_tls_args} --tls_version=${backup_job_mysql_tls_version}"
                     fi
+                else
+                    case "${backup_job_mysql_client,,}" in
+                        mariadb )
+                            mysql_tls_args="--disable-ssl"
+                        ;;
+                        mysql )
+                            mysql_tls_args="--ssl-mode=DISABLED"
+                        ;;
+                    esac
                 fi
             ;;
             "mssql" | "microsoftsql" )
@@ -687,7 +713,7 @@ backup_mysql() {
 
     if [ "${backup_job_db_name,,}" = "all" ] ; then
         write_log debug "Preparing to back up everything except for information_schema and _* prefixes"
-        db_names=$(run_as_user ${_mysql_prefix}mysql -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_enumeration_opts} --batch -e "SHOW DATABASES;" | grep -v Database | grep -v schema )
+        db_names=$(run_as_user ${_mysql_prefix}${_mysql_bin_prefix/-/} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_enumeration_opts} --batch -e "SHOW DATABASES;" | grep -v Database | grep -v schema )
         if [ -n "${backup_job_db_name_exclude}" ] ; then
             db_names_exclusions=$(echo "${backup_job_db_name_exclude}" | tr ',' '\n')
             for db_exclude in ${db_names_exclusions} ; do
@@ -710,7 +736,7 @@ backup_mysql() {
                 pre_dbbackup "${db}"
                 write_log notice "Dumping MySQL/MariaDB database: '${db}' ${compression_string}"
                 if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug on; fi
-                run_as_user ${play_fair} ${_mysql_prefix}mysqldump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_backup_opts} $db | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
+                run_as_user ${play_fair} ${_mysql_prefix}${_mysql_bin_prefix}dump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_backup_opts} $db | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
                 exit_code=$?
                 if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug off; fi
                 check_exit_code backup "${backup_job_filename}"
@@ -731,7 +757,7 @@ backup_mysql() {
         pre_dbbackup all
         write_log notice "Dumping all MySQL / MariaDB databases: '$(echo ${db_names} | xargs | tr ' ' ',')' ${compression_string}"
         if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug on; fi
-        run_as_user ${play_fair} ${_mysql_prefix}mysqldump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_backup_opts} --databases $(echo ${db_names} | xargs) | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
+        run_as_user ${play_fair} ${_mysql_prefix}${_mysql_bin_prefix}dump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_backup_opts} --databases $(echo ${db_names} | xargs) | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
         exit_code=$?
         if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug off; fi
         check_exit_code backup "${backup_job_filename}"
@@ -968,7 +994,7 @@ check_availability() {
             "mysql" )
                 counter=0
                 export MYSQL_PWD=${backup_job_db_pass}
-                while ! (run_as_user mysqladmin -u"${backup_job_db_user}" -P"${backup_job_db_port}" -h"${backup_job_db_host}" ${mysql_tls_args} status > /dev/null 2>&1) ; do
+                while ! (run_as_user ${_mysql_prefix}${_mysql_bin_prefix}admin -u"${backup_job_db_user}" -P"${backup_job_db_port}" -h"${backup_job_db_host}" ${mysql_tls_args} status > /dev/null 2>&1) ; do
                     sleep 5
                     (( counter+=5 ))
                     write_log warn "MySQL/MariaDB Server '${backup_job_db_host}' is not accessible, retrying.. (${counter} seconds so far)"