Release 1.22.0 - See CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.22.0 2020-06-10 <dave at tiredofit dot ca>
+
+   ### Added
+      - Added EXTRA_OPTS variable to all backup commands to pass extra arguments
+
+
+## 1.21.3 2020-06-10 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix `backup-now` manual script due to services.available change
+
+
+## 1.21.2 2020-06-08 <dave at tiredofit dot ca>
+
+   ### Added
+      - Change to support tiredofit/alpine base image 5.0.0
+
+
+## 1.21.1 2020-06-04 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Bugfix to initalization routine
+
+
 ## 1.21.0 2020-06-03 <dave at tiredofit dot ca>
 
    ### Added

examples/docker-compose.yml

@@ -6,7 +6,6 @@ services:
     image: mariadb:latest
     volumes:
       - ./db:/var/lib/mysql
-      - ./post-script.sh:/assets/custom-scripts/post-script.sh
     environment:
       - MYSQL_ROOT_PASSWORD=examplerootpassword
       - MYSQL_DATABASE=example
@@ -21,6 +20,7 @@ services:
      - example-db
     volumes:
       - ./backups:/backup
+      - ./post-script.sh:/assets/custom-scripts/post-script.sh
     environment:
       - DB_TYPE=mariadb
       - DB_HOST=example-db

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

@@ -1,6 +1,7 @@
 #!/usr/bin/with-contenv bash
 
-for s in /assets/functions/*; do source $s; done
+source /assets/functions/00-container
+
 PROCESS_NAME="db-backup"
 
 date >/dev/null
@@ -32,7 +33,7 @@ SIZE_VALUE=${SIZE_VALUE:-"bytes"}
 SPLIT_DB=${SPLIT_DB:-FALSE}
 TMPDIR=/tmp/backups
 
-if [ "BACKUP_TYPE" = "S3" ] || [ "BACKUP_TYPE" = "s3" ] || [ "BACKUP_TYPE" = "MINIO" ] || [ "BACKUP_TYPE" = "minio" ]
+if [ "BACKUP_TYPE" = "S3" ] || [ "BACKUP_TYPE" = "s3" ] || [ "BACKUP_TYPE" = "MINIO" ] || [ "BACKUP_TYPE" = "minio" ] ; then
     S3_PROTOCOL=${S3_PROTOCOL:-"https"}
     sanity_var S3_HOST "S3 Host"
     sanity_var S3_BUCKET "S3 Bucket"
@@ -119,14 +120,14 @@ function backup_mysql() {
                 if [[ "$db" != "information_schema" ]] && [[ "$db" != _* ]] ; then
                     echo "** [db-backup] Dumping database: $db"
                     TARGET=mysql_${db}_${DBHOST}_${now}.sql
-                    mysqldump --max-allowed-packet=512M -h $DBHOST -P $DBPORT -u$DBUSER --databases $db > ${TMPDIR}/${TARGET}
+                    mysqldump --max-allowed-packet=512M -h $DBHOST -P $DBPORT -u$DBUSER  ${EXTRA_OPTS} --databases $db > ${TMPDIR}/${TARGET}
                     generate_md5
                     compression
                     move_backup
                 fi
         done
     else
-        mysqldump --max-allowed-packet=512M -A -h $DBHOST -P $DBPORT -u$DBUSER > ${TMPDIR}/${TARGET}
+        mysqldump --max-allowed-packet=512M -A -h $DBHOST -P $DBPORT -u$DBUSER  ${EXTRA_OPTS} > ${TMPDIR}/${TARGET}
         generate_md5
         compression
         move_backup
@@ -159,14 +160,14 @@ function backup_pgsql() {
             for db in $DATABASES; do
                 print_info "Dumping database: $db"
                 TARGET=pgsql_${db}_${DBHOST}_${now}.sql
-                pg_dump -h ${DBHOST} -p ${DBPORT} -U ${DBUSER} $db > ${TMPDIR}/${TARGET}
+                pg_dump -h ${DBHOST} -p ${DBPORT} -U ${DBUSER} $db ${EXTRA_OPTS}> ${TMPDIR}/${TARGET}
                 generate_md5
                 compression
                 move_backup
             done
         else
             export PGPASSWORD=${DBPASS}
-            pg_dump -h ${DBHOST} -U ${DBUSER} -p ${DBPORT} ${DBNAME} > ${TMPDIR}/${TARGET}
+            pg_dump -h ${DBHOST} -U ${DBUSER} -p ${DBPORT} ${DBNAME} ${EXTRA_OPTS}> ${TMPDIR}/${TARGET}
             generate_md5
             compression
             move_backup
@@ -175,7 +176,7 @@ function backup_pgsql() {
 
 function backup_redis() {
     TARGET=redis_${db}_${DBHOST}_${now}.rdb
-    echo bgsave | redis-cli -h ${DBHOST} -p ${DBPORT} ${REDIS_PASS_STR} --rdb ${TMPDIR}/${TARGET}
+    echo bgsave | redis-cli -h ${DBHOST} -p ${DBPORT} ${REDIS_PASS_STR} --rdb ${TMPDIR}/${TARGET} ${EXTRA_OPTS}
     print_info "Dumping Redis - Flushing Redis Cache First"
     sleep 10
     try=5
@@ -197,7 +198,7 @@ function backup_redis() {
 function backup_rethink() {
     TARGET=rethink_${db}_${DBHOST}_${now}.tar.gz
     print_info "Dumping rethink Database: $db"
-    rethinkdb dump -f ${TMPDIR}/${TARGET} -c ${DBHOST}:${DBPORT} ${RETHINK_PASS_STR} ${RETHINK_DB_STR}
+    rethinkdb dump -f ${TMPDIR}/${TARGET} -c ${DBHOST}:${DBPORT} ${RETHINK_PASS_STR} ${RETHINK_DB_STR} ${EXTRA_OPTS}
     move_backup
 }
 
@@ -276,16 +277,16 @@ function check_availability() {
 function compression() {
    case "$COMPRESSION" in
         "GZ" | "gz" | "gzip" | "GZIP")
-        $GZIP ${TMPDIR}/${TARGET}
+            $GZIP ${TMPDIR}/${TARGET}
-        TARGET=${TARGET}.gz
+            TARGET=${TARGET}.gz
         ;;
         "BZ" | "bz" | "bzip2" | "BZIP2" | "bzip" | "BZIP" | "bz2" | "BZ2")
-        $BZIP ${TMPDIR}/${TARGET}
+            $BZIP ${TMPDIR}/${TARGET}
-        TARGET=${TARGET}.bz2
+            TARGET=${TARGET}.bz2
         ;;
         "XZ" | "xz" | "XZIP" | "xzip" )
-        $XZIP ${TMPDIR}/${TARGET}
+            $XZIP ${TMPDIR}/${TARGET}
-        TARGET=${TARGET}.xz
+            TARGET=${TARGET}.xz
         ;;
         "NONE" | "none" | "FALSE" | "false")
         ;;

install/usr/local/bin/backup-now

@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bash
 
 echo '** Performing Manual Backup'
-/etc/s6/services/10-db-backup/run NOW
+/etc/services.available/10-db-backup/run NOW