diff --git a/CHANGELOG.md b/CHANGELOG.md index 35fdbe2..ab5ac1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 3.8.4 2023-04-06 + + ### Changed + - Fix issue with Influx2 and MSSQL clients not installing properly + + ## 3.8.3 2023-03-30 ### Changed diff --git a/Dockerfile b/Dockerfile index 414675f..cc8e40d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,14 +47,14 @@ RUN source /assets/functions/00-container && \ zstd \ && \ \ - apkArch="$(package --print-arch)"; \ + apkArch="$(apk --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.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 [ $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 [ $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 && \ @@ -78,7 +78,7 @@ RUN source /assets/functions/00-container && \ package remove .db-backup-build-deps && \ package cleanup && \ rm -rf \ - /*.package \ + /*.apk \ /etc/logrotate.d/* \ /root/.cache \ /tmp/* \ diff --git a/install/assets/defaults/10-db-backup b/install/assets/defaults/10-db-backup index 919a346..60280d8 100644 --- a/install/assets/defaults/10-db-backup +++ b/install/assets/defaults/10-db-backup @@ -5,6 +5,7 @@ BLOBXFER_REMOTE_PATH=${BLOBXFER_REMOTE_PATH:-"/docker-db-backup"} CHECKSUM=${CHECKSUM:-"MD5"} COMPRESSION=${COMPRESSION:-"ZSTD"} COMPRESSION_LEVEL=${COMPRESSION_LEVEL:-"3"} +CREATE_LATEST_SYMLINK=${CREATE_LATEST_SYMLINK:-"TRUE"} DB_DUMP_BEGIN=${DB_DUMP_BEGIN:-+0} DB_DUMP_FREQ=${DB_DUMP_FREQ:-1440} DB_DUMP_TARGET=${DB_DUMP_TARGET:-"/backup"}