Skip to content

Commit 01620fe

Browse files
committed
Release 3.8.4 - See CHANGELOG.md
1 parent 18a38b4 commit 01620fe

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 3.8.4 2023-04-06 <dave at tiredofit dot ca>
2+
3+
### Changed
4+
- Fix issue with Influx2 and MSSQL clients not installing properly
5+
6+
17
## 3.8.3 2023-03-30 <dave at tiredofit dot ca>
28

39
### Changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ RUN source /assets/functions/00-container && \
4747
zstd \
4848
&& \
4949
\
50-
apkArch="$(package --print-arch)"; \
50+
apkArch="$(apk --print-arch)"; \
5151
case "$apkArch" in \
5252
x86_64) mssql=true ; influx2=true ; influx_arch=amd64; ;; \
5353
aarch64 ) influx2=true ; influx_arch=arm64 ;; \
5454
*) sleep 0.1 ;; \
5555
esac; \
5656
\
57-
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; \
57+
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; \
5858
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 ; \
5959
\
6060
mkdir -p /usr/src/pbzip2 && \
@@ -78,7 +78,7 @@ RUN source /assets/functions/00-container && \
7878
package remove .db-backup-build-deps && \
7979
package cleanup && \
8080
rm -rf \
81-
/*.package \
81+
/*.apk \
8282
/etc/logrotate.d/* \
8383
/root/.cache \
8484
/tmp/* \

install/assets/defaults/10-db-backup

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ BLOBXFER_REMOTE_PATH=${BLOBXFER_REMOTE_PATH:-"/docker-db-backup"}
55
CHECKSUM=${CHECKSUM:-"MD5"}
66
COMPRESSION=${COMPRESSION:-"ZSTD"}
77
COMPRESSION_LEVEL=${COMPRESSION_LEVEL:-"3"}
8+
CREATE_LATEST_SYMLINK=${CREATE_LATEST_SYMLINK:-"TRUE"}
89
DB_DUMP_BEGIN=${DB_DUMP_BEGIN:-+0}
910
DB_DUMP_FREQ=${DB_DUMP_FREQ:-1440}
1011
DB_DUMP_TARGET=${DB_DUMP_TARGET:-"/backup"}

0 commit comments

Comments
 (0)