This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 881d203080009c3a8827c602c1f6d314f30a67b7 Merge: 2d269a1 42f753b Author: Virtually Nick <[email protected]> AuthorDate: Sun Dec 26 08:37:32 2021 -0700 GUACAMOLE-1418: Merge add support of SQLServer JDBC plugin to Docker build guacamole-docker/README.md | 73 +++++++++++++- guacamole-docker/bin/build-guacamole.sh | 14 +++ guacamole-docker/bin/initdb.sh | 8 +- guacamole-docker/bin/start.sh | 165 +++++++++++++++++++++++++++++++- 4 files changed, 249 insertions(+), 11 deletions(-) diff --cc guacamole-docker/bin/build-guacamole.sh index 878cbc6,41807d9..9f1773d --- a/guacamole-docker/bin/build-guacamole.sh +++ b/guacamole-docker/bin/build-guacamole.sh @@@ -108,20 -108,23 +108,34 @@@ tar -xz # echo "Downloading PostgreSQL JDBC driver ..." -curl -L "https://jdbc.postgresql.org/download/postgresql-9.4-1201.jdbc41.jar" > "$DESTINATION/postgresql/postgresql-9.4-1201.jdbc41.jar" +curl -L "https://jdbc.postgresql.org/download/postgresql-42.2.24.jre7.jar" > "$DESTINATION/postgresql/postgresql-42.2.24.jre7.jar" + +# +# Copy SSO auth extensions +# + +tar -xzf extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/target/*.tar.gz \ + -C "$DESTINATION" \ + --wildcards \ + --no-anchored \ + --strip-components=1 \ + "*.jar" # + # Download SQL Server JDBC driver + # + + 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" + + # # Copy LDAP auth extension and schema modifications #
