Release 4.1.5 - See CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 4.1.5 2024-10-29 <dave at tiredofit dot ca>
+
+   ### Added
+      - Pin to tiredofit/alpine:3.20-7.10.17
+      - MySQL 8.4.3 client
+      - MSSQL and MSODBC 18.4.1.1-1
+      - Influx2 Client Version
+      - AWS Client 1.35.13
+      - Postgresql 17.x Support
+
+
 ## 4.1.4 2024-08-13 <dave at tiredofit dot ca>
 
 Please note that if using encryption using a passphrase, you may be encountering issues with manual decryption. This release fixes that.

Dockerfile

@@ -1,25 +1,136 @@
 ARG DISTRO=alpine
-ARG DISTRO_VARIANT=3.20
+ARG DISTRO_VARIANT=3.20-7.10.17
 
 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
+ENV POSTGRES_VERSION=${POSTGRES_VERSION:-"17.0"}
+
+### Create User Accounts
 RUN source /assets/functions/00-container && \
     set -ex && \
+    addgroup -g 70 postgres && \
+    adduser -S -D -H -h /var/lib/postgresql -s /bin/sh -G postgres -u 70 postgres && \
+    mkdir -p /var/lib/postgresql && \
+    chown -R postgres:postgres /var/lib/postgresql && \
+    \
+    package update && \
+    package upgrade && \
+    package install .postgres-build-deps \
+                    bison \
+                    clang15 \
+                    coreutils \
+                    dpkg-dev \
+                    dpkg \
+                    flex \
+                    g++ \
+                    gcc \
+                    icu-dev \
+                    libc-dev \
+                    libedit-dev \
+                    libxml2-dev \
+                    libxslt-dev \
+                    linux-headers \
+                    llvm15-dev \
+                    lz4-dev \
+                    make \
+                    openldap-dev \
+                    openssl-dev \
+                    perl-dev \
+                    perl-ipc-run \
+                    perl-utils \
+                    python3-dev \
+                    tcl-dev \
+                    util-linux-dev \
+                    zlib-dev \
+                    zstd-dev \
+                    && \
+   \
+   package install .postgres-run-deps \
+                    icu-data-full \
+                    libpq-dev \
+                    llvm15 \
+                    musl-locales \
+                    openssl \
+                    zstd-libs \
+                    && \
+   \
+   mkdir -p /usr/src/postgres && \
+   curl -sSL https://ftp.postgresql.org/pub/source/v$POSTGRES_VERSION/postgresql-$POSTGRES_VERSION.tar.bz2 | tar xvfj - --strip 1 -C /usr/src/postgres && \
+   cd /usr/src/postgres && \
+   awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new && \
+   grep '/var/run/postgresql' src/include/pg_config_manual.h.new && \
+   mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h && \
+   wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb' && \
+   wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' && \
+   export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config" && \
+   export CLANG=clang-15  && \
+   ./configure \
+        --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+        --prefix=/usr/local \
+        --with-includes=/usr/local/include \
+        --with-libraries=/usr/local/lib \
+        --with-system-tzdata=/usr/share/zoneinfo \
+        --with-pgport=5432 \
+        --disable-rpath \
+        --enable-integer-datetimes \
+        --enable-tap-tests \
+        --with-gnu-ld \
+        --with-icu \
+        --with-ldap \
+        --with-libxml \
+        --with-libxslt \
+        --with-llvm \
+        --with-lz4 \
+        --with-openssl \
+        --with-perl \
+        --with-python \
+        --with-tcl \
+        --with-uuid=e2fs \
+        --with-zstd \
+        && \
+    make -j "$(nproc)" world && \
+    make install-world && \
+    make -j "$(nproc)" -C contrib && \
+    make -C contrib/ install && \
+    runDeps="$( \
+		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
+			| tr ',' '\n' \
+			| sort -u \
+			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+			| grep -v -e perl -e python -e tcl \
+            )"; \
+	package install .postgres-additional-deps \
+                    $runDeps \
+	                && \
+	\
+    package remove \
+                    .postgres-build-deps \
+                    && \
+    package cleanup && \
+    find /usr/local -name '*.a' -delete && \
+    rm -rf \
+            /root/.cache \
+            /root/go \
+	        /usr/local/share/doc \
+	        /usr/local/share/man \
+            /usr/src/* \
+            && \
+    set -ex && \
     addgroup -S -g 10000 dbbackup && \
     adduser -S -D -H -u 10000 -G dbbackup -g "Tired of I.T! DB Backup" dbbackup && \
     \
@@ -55,8 +166,6 @@ RUN source /assets/functions/00-container && \
                     openssl \
                     pigz \
                     pixz \
-                    postgresql16 \
-                    postgresql16-client \
                     pv \
                     py3-botocore \
                     py3-colorama \
@@ -75,15 +184,24 @@ 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 ;; \
+    source /assets/functions/00-container && \
+    cd /usr/src/  && \
+    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 ; \
+    sleep 30 && \
     clone_git_repo https://github.com/influxdata/influxdb "${INFLUX1_CLIENT_VERSION}" && \
     go build -o /usr/sbin/influxd ./cmd/influxd && \
     strip /usr/sbin/influxd && \

install/assets/functions/10-db-backup

@@ -687,7 +687,7 @@ backup_mysql() {
 
     if [ "${backup_job_db_name,,}" = "all" ] ; then
         write_log debug "Preparing to back up everything except for information_schema and _* prefixes"
-        db_names=$(run_as_user ${_mysql_prefix}mysql -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_enumeration_opts} --batch -e "SHOW DATABASES;" | grep -v Database | grep -v schema )
+        db_names="$(run_as_user ${_mysql_prefix}mysql -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_enumeration_opts} --batch -e 'SHOW DATABASES;' | grep -v Database | grep -v schema )"
         if [ -n "${backup_job_db_name_exclude}" ] ; then
             db_names_exclusions=$(echo "${backup_job_db_name_exclude}" | tr ',' '\n')
             for db_exclude in ${db_names_exclusions} ; do