Release 3.8.3 - See CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,22 @@
+## 3.8.3 2023-03-30 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Patchup for 3.8.2
+
+
+## 3.8.2 2023-03-30 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Patchup for 3.8.1
+
+
+## 3.8.1 2023-03-30 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Cleanup Dockerfile
+      - Fix issue with DB_ARCHIVE_TIME not firing correctly
+
+
 ## 3.8.0 2023-03-27 <dave at tiredofit dot ca>
 
    ### Added

Dockerfile

@@ -13,9 +13,9 @@ ENV INFLUX2_VERSION=2.4.0 \
 ### Dependencies
 RUN source /assets/functions/00-container && \
     set -ex && \
-    apk update && \
-    apk upgrade && \
-    apk add -t .db-backup-build-deps \
+    package update && \
+    package upgrade && \
+    package install .db-backup-build-deps \
                build-base \
                bzip2-dev \
                git \
@@ -27,7 +27,7 @@ RUN source /assets/functions/00-container && \
                xz-dev \
                && \
     \
-    apk add --no-cache -t .db-backup-run-deps \
+    package install .db-backup-run-deps \
                aws-cli \
                bzip2 \
                influxdb \
@@ -47,14 +47,14 @@ RUN source /assets/functions/00-container && \
                zstd \
                && \
     \
-    apkArch="$(apk --print-arch)"; \
+    apkArch="$(package --print-arch)"; \
     case "$apkArch" in \
 	x86_64) mssql=true ; influx2=true ; influx_arch=amd64; ;; \
     aarch64 ) influx2=true ; influx_arch=arm64 ;; \
     *) sleep 0.1 ;; \
     esac; \
     \
-    if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/msodbcsql18_${MSSQL_VERSION}_amd64.apk ; curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/mssql-tools18_${MSSQL_VERSION}_amd64.apk ; echo y | apk add --allow-untrusted msodbcsql18_${MSSQL_VERSION}_amd64.apk mssql-tools18_${MSSQL_VERSION}_amd64.apk ; else echo >&2 "Detected non x86_64 build variant, skipping MSSQL installation" ; fi; \
+    if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/msodbcsql18_${MSSQL_VERSION}_amd64.package ; curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/mssql-tools18_${MSSQL_VERSION}_amd64.package ; echo y | package add --allow-untrusted msodbcsql18_${MSSQL_VERSION}_amd64.package mssql-tools18_${MSSQL_VERSION}_amd64.package ; else echo >&2 "Detected non x86_64 build variant, skipping MSSQL installation" ; fi; \
     if [ $influx2 = "true" ] ; then curl -sSL https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX2_VERSION}-linux-${influx_arch}.tar.gz | tar xvfz - --strip=1 -C /usr/src/ ; chmod +x /usr/src/influx ; mv /usr/src/influx /usr/sbin/ ; else echo >&2 "Unable to build Influx 2 on this system" ; fi ; \
     \
     mkdir -p /usr/src/pbzip2 && \
@@ -75,12 +75,14 @@ RUN source /assets/functions/00-container && \
     \
     pip3 install blobxfer && \
     \
-### Cleanup
-    apk del .db-backup-build-deps && \
-    rm -rf /usr/src/* && \
-    rm -rf /*.apk && \
-    rm -rf /etc/logrotate.d/redis && \
-    rm -rf /root/.cache /tmp/* /var/cache/apk/*
+    package remove .db-backup-build-deps && \
+    package cleanup && \
+    rm -rf \
+            /*.package \
+            /etc/logrotate.d/* \
+            /root/.cache \
+            /tmp/* \
+            /usr/src/*
+
 
-### S6 Setup
 COPY install  /

README.md

@@ -140,7 +140,7 @@ Be sure to view the following repositories to understand all the customizable op
 | `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/` |
 | `DEBUG_MODE`            | If set to `true`, print copious shell script messages to the container log. Otherwise only basic messages are printed.           | `FALSE`         |
-| `CREATE_LATEST_SYMLINK` | Create a symbolic link pointing to last backup in this format: `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)                             | `TRUE`          |
+| `CREATE_LATEST_SYMLINK` | Create a symbolic link pointing to last backup in this format: `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)`                             | `TRUE`          |
 | `PRE_SCRIPT`            | Fill this variable in with a command to execute pre backing up                                                                   |                 |
 | `POST_SCRIPT`           | Fill this variable in with a command to execute post backing up                                                                  |                 |
 | `SPLIT_DB`              | For each backup, create a new archive. `TRUE` or `FALSE` (MySQL and Postgresql Only)                                             | `TRUE`          |
@@ -171,9 +171,9 @@ Your Organization will be mapped to `DB_USER` and your root token will need to b
 |                          | Absolute HHMM, e.g. `2330` or `0415`                                                                                                                                                               |                              |
 |                          | Relative +MM, i.e. how many minutes after starting the container, e.g. `+0` (immediate), `+10` (in 10 minutes), or `+90` in an hour and a half                                                     |                              |
 | `DB_DUMP_TARGET`         | Directory where the database dumps are kept.                                                                                                                                                       | `${DB_DUMP_TARGET}/archive/` |
-| `DB_DUMP_TARGET_ARCHIVE` | Optional Directory where the database dumps archivs are kept.                                                                                                                                      |
+| `DB_DUMP_TARGET_ARCHIVE` | Optional Directory where the database dumps archives are kept.                                                                                                                                      |
 | `DB_CLEANUP_TIME`        | Value in minutes to delete old backups (only fired when dump freqency fires). 1440 would delete anything above 1 day old. You don't need to set this variable if you want to hold onto everything. | `FALSE`                      |
-| `DB_ARCHIVE_TIME`        | Value in minutes to move all files from `DB_DUMP_TARGET` to `DB_DUMP_TARGET_ARCHIVE` - which is useful when pairing against an external backup system.                                             |
+| `DB_ARCHIVE_TIME`        | Value in minutes to move all files files older than (x) from `DB_DUMP_TARGET` to `DB_DUMP_TARGET_ARCHIVE` - which is useful when pairing against an external backup system.                                             |
 
 - You may need to wrap your `DB_DUMP_BEGIN` value in quotes for it to properly parse. There have been reports of backups that start with a `0` get converted into a different format which will not allow the timer to start at the correct time.
 

install/assets/defaults/10-db-backup

@@ -29,4 +29,3 @@ SIZE_VALUE=${SIZE_VALUE:-"bytes"}
 SKIP_AVAILABILITY_CHECK=${SKIP_AVAILABILITY_CHECK:-"FALSE"}
 SPLIT_DB=${SPLIT_DB:-"TRUE"}
 TEMP_LOCATION=${TEMP_LOCATION:-"/tmp/backups"}
-CREATE_LATEST_SYMLINK=${CREATE_LATEST_SYMLINK:-"TRUE"}

install/assets/functions/10-db-backup

@@ -671,8 +671,7 @@ move_dbbackup() {
                 fi
                 if [ -n "${DB_ARCHIVE_TIME}" ] ; then
                     mkdir -p "${DB_DUMP_TARGET_ARCHIVE}"
-                    find "${DB_DUMP_TARGET}"/  -maxdepth 1 -mmin +"${DB_ARCHIVE_TIME}" -iname "*" -exec mv {} foo \;
-                    find "${DB_DUMP_TARGET}"/  -maxdepth 1 -mmin +"${DB_CLEANUP_TIME}" -iname "*" -exec rm {} \;
+                    find "${DB_DUMP_TARGET}"/  -maxdepth 1 -mmin +"${DB_ARCHIVE_TIME}" -iname "*" -exec mv {} "${DB_DUMP_TARGET_ARCHIVE}" \;
                 fi
             ;;
             "s3" | "minio" )