From 6884e780da11391b5a0d29cea0db97ca5e8e4931 Mon Sep 17 00:00:00 2001
From: Mike Jumper <mjumper@apache.org>
Date: Mon, 10 Jul 2023 11:11:57 -0700
Subject: [PATCH] GUACAMOLE-1807: Add Docker build arguments for JDBC driver
 versions.

---
 Dockerfile                              |  5 +++++
 guacamole-docker/bin/build-guacamole.sh | 15 +++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ba540274c..e56c5eef1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,6 +50,11 @@ RUN apt-get update && apt-get install -y firefox
 # as well: `--build-arg MAVEN_ARGUMENTS="-P lgpl-extensions -DskipTests=false"`.
 ARG MAVEN_ARGUMENTS="-DskipTests=false"
 
+# Versions of JDBC drivers to bundle within image
+ARG MSSQL_JDBC_VERSION=12.2.0
+ARG MYSQL_JDBC_VERSION=8.0.32
+ARG PGSQL_JDBC_VERSION=42.3.8
+
 # Build environment variables
 ENV \
     BUILD_DIR=/tmp/guacamole-docker-BUILD
diff --git a/guacamole-docker/bin/build-guacamole.sh b/guacamole-docker/bin/build-guacamole.sh
index 275871beb..2a8ef4124 100755
--- a/guacamole-docker/bin/build-guacamole.sh
+++ b/guacamole-docker/bin/build-guacamole.sh
@@ -83,7 +83,7 @@ tar -xzf extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/target/
 #
 
 echo "Downloading MySQL Connector/J ..."
-curl -L "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-8.0.32.tar.gz" | \
+curl -L "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-$MYSQL_JDBC_VERSION.tar.gz" | \
 tar -xz                        \
     -C "$DESTINATION/mysql/"   \
     --wildcards                \
@@ -97,7 +97,8 @@ tar -xz                        \
 #
 
 echo "Downloading PostgreSQL JDBC driver ..."
-curl -L "https://jdbc.postgresql.org/download/postgresql-42.3.8.jar" > "$DESTINATION/postgresql/postgresql-42.3.8.jar"
+curl -L "https://jdbc.postgresql.org/download/postgresql-$PGSQL_JDBC_VERSION.jar" \
+    > "$DESTINATION/postgresql/postgresql-$PGSQL_JDBC_VERSION.jar"
 
 #
 # Copy SSO auth extensions
@@ -115,14 +116,8 @@ tar -xzf extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/target/*.
 #
 
 echo "Downloading SQL Server JDBC driver ..."
-curl -L "https://go.microsoft.com/fwlink/?linkid=2183223&clcid=0x409" | \
-tar -xz                        \
-    -C "$DESTINATION/sqlserver/"   \
-    --wildcards                \
-    --no-anchored              \
-    --no-wildcards-match-slash \
-    --strip-components=2       \
-    "mssql-jdbc-*.jre8.jar"
+curl -L "https://github.com/microsoft/mssql-jdbc/releases/download/v$MSSQL_JDBC_VERSION/mssql-jdbc-$MSSQL_JDBC_VERSION.jre8.jar" \
+    > "$DESTINATION/sqlserver/mssql-jdbc-$MSSQL_JDBC_VERSION.jre8.jar"   \
 
 #
 # Copy LDAP auth extension and schema modifications