From 31b256b02d0f68ed020a7dcccbccb66b2452a6d8 Mon Sep 17 00:00:00 2001 From: "dave@tiredofit.ca" Date: Thu, 12 Oct 2023 07:35:12 -0700 Subject: [PATCH] Release 3.11.0 - See CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ Dockerfile | 13 +++++++------ README.md | 4 ++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9bfc12..a001e8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 3.11.0 2023-10-12 + + ### Added + - Introduce aarch64 (ARMv8) support for Microsoft SQL Server backups + - Microsoft ODBC Driver 18.3.2.1-1 + - Microsoft SQL Client 18.3.1.1-1 + + ## 3.10.5 2023-10-11 ### Added diff --git a/Dockerfile b/Dockerfile index 979c7b7..7ce1f5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,8 @@ LABEL maintainer="Dave Conroy (github.com/tiredofit)" ### Set Environment Variables ENV INFLUX_VERSION=1.8.0 \ INFLUX2_VERSION=2.4.0 \ - MSSQL_VERSION=18.0.1.1-1 \ + MSODBC_VERSION=18.3.2.1-1 \ + MSSQL_VERSION=18.3.1.1-1 \ AWS_CLI_VERSION=1.25.97 \ CONTAINER_ENABLE_MESSAGING=FALSE \ CONTAINER_ENABLE_MONITORING=TRUE \ @@ -63,14 +64,14 @@ RUN source /assets/functions/00-container && \ zstd \ && \ \ - apkArch="$(apk --print-arch)"; \ + apkArch="$(uname -m)"; \ case "$apkArch" in \ - x86_64) mssql=true ; influx2=true ; influx_arch=amd64; ;; \ - aarch64 ) influx2=true ; influx_arch=arm64 ;; \ - *) sleep 0.1 ;; \ + x86_64) mssql=true ; mssql_arch=amd64; influx2=true ; influx_arch=amd64; ;; \ + arm64 ) mssql=true ; mssql_arch=amd64; 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/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; ls -l ; echo y | apk add --allow-untrusted msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; else echo >&2 "Detected non x86_64 or ARM64 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 ; \ clone_git_repo https://github.com/aws/aws-cli "${AWS_CLI_VERSION}" && \ python3 setup.py install --prefix=/usr && \ diff --git a/README.md b/README.md index e62263c..881de9d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This will build a container for backing up multiple types of DB Servers -Currently backs up CouchDB, InfluxDB, MySQL, MongoDB, Postgres, Redis servers. +Currently backs up CouchDB, InfluxDB, MySQL, Microsoft SQL, MongoDB, Postgres, Redis servers. * dump to local filesystem or backup to S3 Compatible services, and Azure. * select database user and password @@ -149,7 +149,7 @@ Be sure to view the following repositories to understand all the customizable op | Parameter | Description | Default | `_FILE` | | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- | ------- | | `DB_AUTH` | (Mongo Only - Optional) Authentication Database | | | -| `DB_TYPE` | Type of DB Server to backup `couch` `influx` `mysql` `pgsql` `mongo` `redis` `sqlite3` | | | +| `DB_TYPE` | Type of DB Server to backup `couch` `influx` `mysql` `mssql` `pgsql` `mongo` `redis` `sqlite3` | | | | `DB_HOST` | Server Hostname e.g. `mariadb`. For `sqlite3`, full path to DB file e.g. `/backup/db.sqlite3` | | x | | `DB_NAME` | Schema Name e.g. `database` or `ALL` to backup all databases the user has access to. Backup multiple by seperating with commas eg `db1,db2` | | x | | `DB_NAME_EXCLUDE` | If using `ALL` - use this as to exclude databases seperated via commas from being backed up | | x |