From c6b5a9287214f596cace2640564750fb58368642 Mon Sep 17 00:00:00 2001 From: "David E. Wheeler" Date: Fri, 18 Aug 2023 12:03:50 -0400 Subject: [PATCH] Upgrade Snowflake and Oracle clients And add the misssing SNOWSQL_ROLE environment variable to docker-sqitch.sh. --- docker-sqitch.sh | 2 +- oracle/Dockerfile | 4 ++-- snowflake/Dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-sqitch.sh b/docker-sqitch.sh index dc71aa3..b1eeb99 100755 --- a/docker-sqitch.sh +++ b/docker-sqitch.sh @@ -39,7 +39,7 @@ for var in \ TNS_ADMIN TWO_TASK ORACLE_SID \ ISC_USER ISC_PASSWORD \ VSQL_HOST VSQL_PORT VSQL_USER VSQL_PASSWORD VSQL_SSLMODE \ - SNOWSQL_ACCOUNT SNOWSQL_USER SNOWSQL_PWD SNOWSQL_HOST SNOWSQL_PORT SNOWSQL_DATABASE SNOWSQL_REGION SNOWSQL_WAREHOUSE SNOWSQL_PRIVATE_KEY_PASSPHRASE + SNOWSQL_ACCOUNT SNOWSQL_USER SNOWSQL_PWD SNOWSQL_HOST SNOWSQL_PORT SNOWSQL_DATABASE SNOWSQL_REGION SNOWSQL_WAREHOUSE SNOWSQL_PRIVATE_KEY_PASSPHRASE SNOWSQL_ROLE do if [ -n "${!var}" ]; then passopt+=(-e $var) diff --git a/oracle/Dockerfile b/oracle/Dockerfile index 3530eeb..5c758d4 100644 --- a/oracle/Dockerfile +++ b/oracle/Dockerfile @@ -2,8 +2,8 @@ FROM debian:bullseye-slim AS ora-build WORKDIR /work # https://www.oracle.com/database/technologies/instant-client/linux-x86-64-downloads.html -ARG INSTANTCLIENT_VERSION=21.10.0.0.0dbru -ARG INSTANTCLIENT_VDIR=2110000 +ARG INSTANTCLIENT_VERSION=21.11.0.0.0dbru +ARG INSTANTCLIENT_VDIR=2111000 ADD https://download.oracle.com/otn_software/linux/instantclient/${INSTANTCLIENT_VDIR}/instantclient-basic-linux.x64-${INSTANTCLIENT_VERSION}.zip ./ ADD https://download.oracle.com/otn_software/linux/instantclient/${INSTANTCLIENT_VDIR}/instantclient-sqlplus-linux.x64-${INSTANTCLIENT_VERSION}.zip ./ diff --git a/snowflake/Dockerfile b/snowflake/Dockerfile index 06f8437..9a7b6f9 100644 --- a/snowflake/Dockerfile +++ b/snowflake/Dockerfile @@ -6,8 +6,8 @@ WORKDIR /work # https://docs.snowflake.com/en/user-guide/snowsql-install-config # https://docs.snowflake.com/en/release-notes/client-change-log-snowsql # https://sfc-repo.snowflakecomputing.com/index.html -ADD https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowsql-1.2.27-linux_x86_64.bash snowsql.bash -ADD https://sfc-repo.snowflakecomputing.com/odbc/linux/2.25.12/snowflake_linux_x8664_odbc-2.25.12.tgz snowflake_linux_x8664_odbc.tgz +ADD https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowsql-1.2.28-linux_x86_64.bash snowsql.bash +ADD https://sfc-repo.snowflakecomputing.com/odbc/linuxaarch64/3.0.2/snowflake_linux_aarch64_odbc-3.0.2.tgz snowflake_linux_x8664_odbc.tgz COPY conf ./ # Tell SnowSQL where to store its versions and config. Need to keep it inside