From 67f4326d0b70d59d7b8d226023448ca2af397ec9 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Thu, 7 Nov 2024 11:16:32 -0800
Subject: [PATCH] Release 4.1.9 - See CHANGELOG.md

---
 CHANGELOG.md | 12 ++++++++++++
 Dockerfile   | 45 +++++++++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 910b584..0ac149b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 4.1.9 2024-11-07 <dave at tiredofit dot ca>
+
+   ### Added
+      - Pin to tiredofit/alpine:edge-7.10.19
+      - MySQL 8.4.3 client
+      - MSSQL and MSODBC 18.4.1.1-1
+      - Mysql 11.x Support
+      - Influx2 Client 2.7.5
+      - AWS Client 1.35.13
+      - Postgresql 17.x Support
+
+
 ## 4.1.8 2024-10-29 <dave at tiredofit dot ca>
 
 Rebuild using 4.1.4 sources - ignore any versions of 4.1.5-4.1.7
diff --git a/Dockerfile b/Dockerfile
index 8c3999b..124672a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,21 @@
 ARG DISTRO=alpine
-ARG DISTRO_VARIANT=3.20
+ARG DISTRO_VARIANT=edge-7.10.19
 
 FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
-### Set Environment Variables
 ENV INFLUX1_CLIENT_VERSION=1.8.0 \
-    INFLUX2_CLIENT_VERSION=2.7.3 \
-    MSODBC_VERSION=18.3.2.1-1 \
-    MSSQL_VERSION=18.3.1.1-1 \
-    MYSQL_VERSION=mysql-8.4.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_REPO_URL=https://github.com/mysql/mysql-server \
-    AWS_CLI_VERSION=1.32.113 \
+    AWS_CLI_VERSION=1.35.13 \
     CONTAINER_ENABLE_MESSAGING=TRUE \
     CONTAINER_ENABLE_MONITORING=TRUE \
     IMAGE_NAME="tiredofit/db-backup" \
     IMAGE_REPO_URL="https://github.com/tiredofit/docker-db-backup/"
 
-### Dependencies
 RUN source /assets/functions/00-container && \
     set -ex && \
     addgroup -S -g 10000 dbbackup && \
@@ -33,6 +31,7 @@ RUN source /assets/functions/00-container && \
                     git \
                     go \
                     libarchive-dev \
+                    libtirpc-dev \
                     openssl-dev \
                     libffi-dev \
                     ncurses-dev \
@@ -48,6 +47,7 @@ RUN source /assets/functions/00-container && \
                     gpg-agent \
                     groff \
                     libarchive \
+                    libtirpc \
                     mariadb-client \
                     mariadb-connector-c \
                     mongodb-tools \
@@ -55,8 +55,8 @@ RUN source /assets/functions/00-container && \
                     openssl \
                     pigz \
                     pixz \
-                    postgresql16 \
-                    postgresql16-client \
+                    postgresql17 \
+                    postgresql17-client \
                     pv \
                     py3-botocore \
                     py3-colorama \
@@ -75,15 +75,28 @@ RUN source /assets/functions/00-container && \
                     zstd \
                     && \
     \
-    apkArch="$(uname -m)"; \
-    case "$apkArch" in \
-	    x86_64) mssql=true ; mssql_arch=amd64; influx2=true ; influx_arch=amd64; ;; \
-        arm64 | aarch64 ) mssql=true ; mssql_arch=amd64; influx2=true ; influx_arch=arm64 ;; \
+    case "$(uname -m)" in \
+	    "x86_64" ) mssql=true ; mssql_arch=amd64; influx2=true ; influx_arch=amd64; ;; \
+        "arm64" | "aarch64" ) mssql=true ; mssql_arch=arm64; influx2=true ; influx_arch=arm64 ;; \
         *) sleep 0.1 ;; \
     esac; \
     \
-    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 ; 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_CLIENT_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 ; \
+    if [ "${mssql,,}" = "true" ] ; then \
+        curl -sSLO https://download.microsoft.com/download/7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; \
+        curl -sSLO https://download.microsoft.com/download/7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; \
+        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_CLIENT_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/influxdata/influxdb "${INFLUX1_CLIENT_VERSION}" && \
     go build -o /usr/sbin/influxd ./cmd/influxd && \
     strip /usr/sbin/influxd && \