Release 3.3.10 - See CHANGELOG.md

Fix reading port number in interactive restore

CHANGELOG.md

@@ -1,3 +1,27 @@
+## 3.3.10 2022-07-19 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Remove MSSQL install packages properly
+
+
+## 3.3.9 2022-07-09 <fardeau@github>
+
+   ### Fixed
+      - Remaining work on interactive mode for entering port on restore script
+
+
+## 3.3.8 2022-07-09 <dave at tiredofit dot ca>
+
+   ### Added
+      - MSSQL Client Tools 18.0.1.1-1
+
+
+## 3.3.7 2022-06-23 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Allow overrides to actually override with the restore script
+
+
 ## 3.3.6 2022-06-23 <dave at tiredofit dot ca>
 
    ### Changed

Dockerfile

@@ -4,7 +4,7 @@ LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 ### Set Environment Variables
 
 ENV INFLUX2_VERSION=2.2.1 \
-    MSSQL_VERSION=17.8.1.1-1 \
+    MSSQL_VERSION=18.0.1.1-1 \
     CONTAINER_ENABLE_MESSAGING=FALSE \
     CONTAINER_ENABLE_MONITORING=TRUE \
     CONTAINER_PROCESS_RUNAWAY_PROTECTOR=FALSE \
@@ -42,8 +42,6 @@ RUN set -ex && \
                zstd \
                && \
     \
-    cd /usr/src && \
-    \
     apkArch="$(apk --print-arch)"; \
     case "$apkArch" in \
 	x86_64) mssql=true ; influx2=true ; influx_arch=amd64; ;; \
@@ -51,7 +49,7 @@ RUN set -ex && \
     *) sleep 0.1 ;; \
     esac; \
     \
-    if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MSSQL_VERSION}_amd64.apk ; curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/mssql-tools_${MSSQL_VERSION}_amd64.apk ; echo y | apk add --allow-untrusted msodbcsql17_${MSSQL_VERSION}_amd64.apk mssql-tools_${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/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 && \
@@ -73,6 +71,7 @@ RUN set -ex && \
 ### Cleanup
     apk del .db-backup-build-deps && \
     rm -rf /usr/src/* && \
+    rm -rf /*.apk && \
     rm -rf /etc/logrotate.d/redis && \
     rm -rf /root/.cache /tmp/* /var/cache/apk/*
 

install/usr/local/bin/restore

@@ -641,7 +641,7 @@ EOF
         2 )
             while true; do
                 read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E${cdgy}\)  : ${cwh}${coff}) " q_dbport_menu
-                case "${q_port_menu,,}" in
+                case "${q_dbport_menu,,}" in
                     c* )
                         counter=1
                         q_dbport=" "
@@ -829,11 +829,7 @@ print_debug "Filename to recover '${r_filename}'"
 
 ## Question Database Type
 if [ -n "${2}" ]; then
-    if [ ! -f "${2}" ]; then
+    r_dbtype="${2}"
-        get_dbtype
-    else
-        r_dbtype="${2}"
-    fi
 else
     get_dbtype
 fi
@@ -841,11 +837,7 @@ print_debug "Database type '${r_dbtype}'"
 
 ## Question Database Host
 if [ -n "${3}" ]; then
-    if [ ! -f "${3}" ]; then
+    r_dbhost="${3}"
-        get_dbhost
-    else
-        r_dbhost="${3}"
-    fi
 else
     get_dbhost
 fi
@@ -853,11 +845,7 @@ print_debug "Database Host '${r_dbhost}'"
 
 ## Question Database Name
 if [ -n "${4}" ]; then
-    if [ ! -f "${4}" ]; then
+    r_dbname="${4}"
-        get_dbname
-    else
-        r_dbname="${4}"
-    fi
 else
     get_dbname
 fi
@@ -865,11 +853,7 @@ print_debug "Database Name '${r_dbname}'"
 
 ## Question Database User
 if [ -n "${5}" ]; then
-    if [ ! -f "${5}" ]; then
+    r_dbuser="${5}"
-        get_dbuser
-    else
-        r_dbuser="${5}"
-    fi
 else
     get_dbuser
 fi
@@ -877,11 +861,7 @@ print_debug "Database User '${r_dbuser}'"
 
 ## Question Database Password
 if [ -n "${6}" ]; then
-    if [ ! -f "${6}" ]; then
+    r_dbpass="${6}"
-        get_dbpass
-    else
-        r_dbpass="${6}"
-    fi
 else
     get_dbpass
 fi
@@ -889,11 +869,7 @@ print_debug "Database Pass '${r_dbpass}'"
 
 ## Question Database Port
 if [ -n "${7}" ]; then
-    if [ ! -f "${7}" ]; then
+    r_dbport="${7}"
-        get_dbport
-    else
-        r_dbport="${7}"
-    fi
 else
     get_dbport
 fi