From 6fe266bddf8f09fc717265efb498d12787270a9a Mon Sep 17 00:00:00 2001
From: MatthewReed303 <63492864+MatthewReed303@users.noreply.github.com>
Date: Sun, 25 Aug 2024 17:28:49 +1200
Subject: [PATCH 1/2] Update package.json

Update odbc to 2.4.9
---
 server/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/package.json b/server/package.json
index 6f8d36524..f61361622 100644
--- a/server/package.json
+++ b/server/package.json
@@ -39,7 +39,7 @@
     "node-schedule": "2.1.1",
     "nodemailer": "6.9.9",
     "nopt": "5.0.0",
-    "odbc": "2.4.8",
+    "odbc": "2.4.9",
     "pdfmake": "0.2.5",
     "socket.io": "2.5.0",
     "sqlite3": "5.1.5",

From 3615eb196a81de31ffd13a04d7503db790c0ccac Mon Sep 17 00:00:00 2001
From: MatthewReed303 <63492864+MatthewReed303@users.noreply.github.com>
Date: Sun, 25 Aug 2024 17:59:59 +1200
Subject: [PATCH 2/2] Update Dockerfile

change node to v18 to support odbc v2.4.9, remove old node-odbc build and install as v2.4.9 release fixes some bugs that caused install issues
---
 Dockerfile | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a46592c12..9f61c6dfa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-bookworm
+FROM node:18-bookworm
 
 ARG NODE_SNAP=false
 
@@ -25,26 +25,6 @@ WORKDIR /usr/src/app
 # Copy odbcinst.ini to /etc
 RUN cp FUXA/odbc/odbcinst.ini /etc/odbcinst.ini
 
-# Clone node-odbc repository
-RUN git clone https://github.com/markdirish/node-odbc.git
-
-# Change working directory to node-odbc
-WORKDIR /usr/src/app/node-odbc
-
-# Install compatible versions of global npm packages
-RUN npm install -g node-gyp && \
-    npm install -g npm@8 && \
-    npm install -g node-addon-api && \
-    npm install -g @mapbox/node-pre-gyp
-
-# Install dependencies and build node-odbc
-RUN npm ci --production && \
-    ./node_modules/.bin/node-pre-gyp rebuild --production && \
-    ./node_modules/.bin/node-pre-gyp package
-
-# Build and install node-odbc
-#RUN npm install
-
 # Install Fuxa server
 WORKDIR /usr/src/app/FUXA/server
 RUN npm install