Release 3.0.10 - See CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,52 @@
+## 3.0.10 2022-03-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for restore script not taking "custom" usernames or passwords
+
+
+## 3.0.9 2022-03-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Switch to using parallel versions of compression tools all the time, yet explicitly state the threads in use (1 or ++)
+
+
+## 3.0.8 2022-03-21 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add PARALLEL_COMPRESSION_THREADS environment variable to limit amount of threads when compressing - Currently autodetects however many processors are avaialable to the container
+
+
+## 3.0.7 2022-03-21 <dave at tiredofit dot ca>
+
+   ### Reverted
+      - Strip unused LOG directives
+
+
+## 3.0.6 2022-03-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for parallel compression
+
+
+## 3.0.5 2022-03-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Add more detail regarding manual modes
+
+
+## 3.0.4 2022-03-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for 3.0.3
+
+
+## 3.0.3 2022-03-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Add documentation for Manual mode
+      - Revert Compression variables
+
+
 ## 3.0.2 2022-03-18 <dave at tiredofit dot ca>
 
    ### Changed

README.md

@@ -47,10 +47,15 @@ Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers.
   - [Persistent Storage](#persistent-storage-1)
   - [Environment Variables](#environment-variables)
     - [Base Images used](#base-images-used)
+    - [Container Options](#container-options)
+  - [Database Specific Options](#database-specific-options)
+  - [Scheduling Options](#scheduling-options)
+  - [Backup Options](#backup-options)
     - [Backing Up to S3 Compatible Services](#backing-up-to-s3-compatible-services)
 - [Maintenance](#maintenance)
   - [Shell Access](#shell-access)
   - [Manual Backups](#manual-backups)
+  - [Restoring Databases](#restoring-databases)
   - [Custom Scripts](#custom-scripts)
 - [Support](#support)
   - [Usage](#usage)
@@ -120,6 +125,7 @@ Be sure to view the following repositories to understand all the customizable op
 | ----------------- | -------------------------------------------------------------------------------------------------------------------------------- | --------------- |
 | `BACKUP_LOCATION` | Backup to `FILESYSTEM` or `S3` compatible services like S3, Minio, Wasabi                                                        | `FILESYSTEM`    |
 | `MODE`            | `AUTO` mode to use internal scheduling routines or `MANUAL` to simply use this as manual backups only executed by your own means | `AUTO`          |
+| `MANUAL_RUN_FOREVER` | `TRUE` or `FALSE` if you wish to try to make the container exit after the backup | `TRUE` |
 | `TEMP_LOCATION`   | Perform Backups and Compression in this temporary directory                                                                      | `/tmp/backups/` |
 | `DB_AUTH`         | (Mongo Only - Optional) Authentication Database                                                                                  |                 |
 | `DEBUG_MODE`      | If set to `true`, print copious shell script messages to the container log. Otherwise only basic messages are printed.           | `FALSE`         |
@@ -148,15 +154,17 @@ Be sure to view the following repositories to understand all the customizable op
 ### Backup Options
 | Parameter                     | Description                                                                                                                  | Default |
 | ----------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ------- |
-| `ENABLE_COMPRESSION`          | Use either Gzip `GZ`, Bzip2 `BZ`, XZip `XZ`, ZSTD `ZSTD` or none `NONE`                                                      | `GZ`    |
+| `COMPRESSION`                 | Use either Gzip `GZ`, Bzip2 `BZ`, XZip `XZ`, ZSTD `ZSTD` or none `NONE`                                                      | `GZ`    |
-| `ENABLE_PARALLEL_COMPRESSION` | Use multiple cores when compressing backups `TRUE` or `FALSE`                                                                | `TRUE`  |
 | `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`     |
+| `ENABLE_PARALLEL_COMPRESSION` | Use multiple cores when compressing backups `TRUE` or `FALSE`                                                                | `TRUE`  |
+| `PARALLEL_COMPRESSION_THREADS` | Maximum amount of threads to use when compressing - Integer value e.g. `8` | `autodetected` |
 | `ENABLE_CHECKSUM`             | Generate either a MD5 or SHA1 in Directory, `TRUE` or `FALSE`                                                                | `TRUE`  |
 | `CHECKSUM`                    | Either `MD5` or `SHA1`                                                                                                       | `MD5`   |
 | `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`  |
 | `MYSQL_SINGLE_TRANSACTION`    | Backup in a single transaction with MySQL / MariaDB                                                                          | `TRUE`  |
 | `MYSQL_STORED_PROCEDURES`     | Backup stored procedures with MySQL / MariaDB                                                                                | `TRUE`  |
+
 - When using compression with MongoDB, only `GZ` compression is possible.
 
 #### Backing Up to S3 Compatible Services
@@ -190,6 +198,8 @@ docker exec -it (whatever your container name is) bash
 ### Manual Backups
 Manual Backups can be performed by entering the container and typing `backup-now`
 
+- Recently there was a request to have the container work with Kukbernetes cron scheduling. This can theoretically be accomplished by setting the container `MODE=MANUAL` and then setting `MANUAL_RUN_FOREVER=FALSE` - You would also want to disable a few features from the upstream base images specifically `CONTAINER_ENABLE_SCHEDULING` and `CONTAINER_ENABLE_MONITORING`. This should allow the container to start, execute a backup by executing and then exit cleanly. An alternative way to running the script is to execute `/etc/services.available/10-db-backup/run`.
+
 ### Restoring Databases
 Entering in the container and executing `restore` will execute a menu based script to restore your backups.
 

install/assets/defaults/10-db-backup

@@ -2,20 +2,19 @@
 
 BACKUP_LOCATION=${BACKUP_LOCATION:-"FILESYSTEM"}
 CHECKSUM=${CHECKSUM:-"MD5"}
+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"}
 ENABLE_CHECKSUM=${ENABLE_CHECKSUM:-"TRUE"}
-ENABLE_COMPRESSION=${ENABLE_COMPRESSION:-"GZ"}
+ENABLE_PARALLEL_COMPRESSION=${ENABLE_PARALLEL_COMPRESSION}:-"TRUE"}
-ENABLE_PARALLEL_COMPRESSION={ENABLE_PARALLEL_COMPRESSION:-"TRUE"}
-LOG_PATH=${LOG_PATH:-"/logs/"}
-LOG_TYPE=${LOG_TYPE:-"BOTH"}
 MANUAL_RUN_FOREVER=${MANUAL_RUN_FOREVER:-"TRUE"}
 MODE=${MODE:-"AUTO"}
 MYSQL_MAX_ALLOWED_PACKET=${MYSQL_MAX_ALLOWED_PACKET:-"512M"}
 MYSQL_SINGLE_TRANSACTION=${MYSQL_SINGLE_TRANSACTION:-"TRUE"}
 MYSQL_STORED_PROCEDURES=${MYSQL_STORED_PROCEDURES:-"TRUE"}
+PARALLEL_COMPRESSION_THREADS=${PARALLEL_COMPRESSION_THREADS:-"$(nproc)"}
 S3_CERT_SKIP_VERIFY=${S3_CERT_SKIP_VERIFY:-"TRUE"}
 S3_PROTOCOL=${S3_PROTOCOL:-"https"}
 SIZE_VALUE=${SIZE_VALUE:-"bytes"}

install/assets/functions/10-db-backup

@@ -3,15 +3,17 @@
 bootstrap_compression() {
     ### Set Compression Options
     if var_true "${ENABLE_PARALLEL_COMPRESSION}" ; then
-        bzip="pbzip2 -${COMPRESSION_LEVEL}"
+        print_debug "Utilizing '${PARALLEL_COMPRESSION_THREADS}' compression threads"
-        gzip="pigz -${COMPRESSION_LEVEL}"
+        bzip="pbzip2 -${COMPRESSION_LEVEL} -p ${PARALLEL_COMPRESSION_THREADS}"
-        xzip="pixz -${COMPRESSION_LEVEL}"
+        gzip="pigz -${COMPRESSION_LEVEL} -p ${PARALLEL_COMPRESSION_THREADS}"
-        zstd="zstd --rm -${COMPRESSION_LEVEL}"
+        xzip="pixz -${COMPRESSION_LEVEL} -p ${PARALLEL_COMPRESSION_THREADS}"
+        zstd="zstd --rm -${COMPRESSION_LEVEL} -T${PARALLEL_COMPRESSION_THREADS}"
     else
-        bzip="bzip2 -${COMPRESSION_LEVEL}"
+        print_debug "Utilizing single compression thread"
-        gzip="gzip -${COMPRESSION_LEVEL}"
+        bzip="pbzip2 -${COMPRESSION_LEVEL} -p 1"
-        xzip="xz -${COMPRESSION_LEVEL} "
+        gzip="pigz -${COMPRESSION_LEVEL} -p 1"
-        zstd="zstd --rm -${COMPRESSION_LEVEL}"
+        xzip="pixz -${COMPRESSION_LEVEL} -p 1"
+        zstd="zstd --rm -${COMPRESSION_LEVEL} -T1"
     fi
 }
 
@@ -338,7 +340,7 @@ check_exit_code() {
 }
 
 compression() {
-   case "${ENABLE_COMPRESSION,,}" in
+   case "${COMPRESSION,,}" in
         gz* )
             print_notice "Compressing backup with gzip"
             target=${target}.gz

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

@@ -8,6 +8,11 @@ PROCESS_NAME="db-backup"
 bootstrap_compression
 bootstrap_variables
 
+if [ "${MODE,,}" = "manual" ] ; then
+    DB_DUMP_BEGIN=+0
+    manual=TRUE
+fi
+
 case "${1,,}" in
     "now" | "manual" )
         DB_DUMP_BEGIN=+0
@@ -27,22 +32,24 @@ case "${1,,}" in
         :
     ;;
     * )
-        current_time=$(date +"%s")
+        if [ "${manual,,}" = "true" ]; then
-        today=$(date +"%Y%m%d")
+            current_time=$(date +"%s")
+            today=$(date +"%Y%m%d")
 
-        if [[ $DB_DUMP_BEGIN =~ ^\+(.*)$ ]]; then
+            if [[ $DB_DUMP_BEGIN =~ ^\+(.*)$ ]]; then
-            waittime=$(( ${BASH_REMATCH[1]} * 60 ))
+                waittime=$(( ${BASH_REMATCH[1]} * 60 ))
-            target_time=$(($current_time + $waittime))
+                target_time=$(($current_time + $waittime))
-        else
+            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
+                if [[ "$target_time" < "$current_time" ]]; then
-                target_time=$(($target_time + 24*60*60))
+                    target_time=$(($target_time + 24*60*60))
+                fi
+                waittime=$(($target_time - $current_time))
             fi
-            waittime=$(($target_time - $current_time))
+                print_debug "Wait Time: ${waittime} Target time: ${target_time} Current Time: ${current_time}"
+                print_info "Next Backup at $(date -d @${target_time} +"%Y-%m-%d %T %Z")"
+                sleep $waittime
         fi
-            print_debug "Wait Time: ${waittime} Target time: ${target_time} Current Time: ${current_time}"
-            print_info "Next Backup at $(date -d @${target_time} +"%Y-%m-%d %T %Z")"
-            sleep $waittime
     ;;
 esac
 
@@ -94,7 +101,7 @@ while true; do
     backup_finish_time=$(date +"%s")
     backup_total_time=$(echo $((backup_finish_time-backup_start_time)))
 
-    print_info "Backup finish time: $(date -d @${backup_finish_time} +"%Y-%m-%d %T %Z")"
+    print_info "Backup finish time: $(date -d @${backup_finish_time} +"%Y-%m-%d %T %Z") with exit code ${exit_code}"
     print_notice "Backup time elapsed: $(echo ${backup_total_time} | awk '{printf "Hours: %d Minutes: %02d Seconds: %02d", $1/3600, ($1/60)%60, $1%60}')"
 
     ### Zabbix / Monitoring stats

install/usr/local/bin/restore

@@ -697,9 +697,9 @@ EOF
                     c* )
                         counter=1
                         q_dbuser=" "
-                        while [[ $q_dbname = *" "* ]];  do
+                        while [[ $q_dbuser = *" "* ]];  do
                             if [ $counter -gt 1 ] ; then print_error "DB Usernames can't have spaces in them, please re-enter." ; fi ;
-                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB User do you wish to use:\ ${coff})" q_dbname
+                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB User do you wish to use:\ ${coff})" q_dbuser
                             (( counter+=1 ))
                         done
                         r_dbuser=${q_dbuser}
@@ -766,9 +766,9 @@ EOF
                     c* )
                         counter=1
                         q_dbpass=" "
-                        while [[ $q_dbname = *" "* ]];  do
+                        while [[ $q_dbpass = *" "* ]];  do
                             if [ $counter -gt 1 ] ; then print_error "DB Passwords can't have spaces in them, please re-enter." ; fi ;
-                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB Password do you wish to use:\ ${coff})" q_dbname
+                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB Password do you wish to use:\ ${coff})" q_dbpass
                             (( counter+=1 ))
                         done
                         r_dbpass=${q_dbpass}