Skip to content
Snippets Groups Projects
Commit c1c96107 authored by Eric Schoville's avatar Eric Schoville
Browse files

Merge branch 'revert_snowflake_odbc' into 'master'

Something broke in MR-28, reverting.

See merge request !31
parents 2987808a 7fcd2338
No related branches found
No related tags found
1 merge request!31Something broke in MR-28, reverting.
...@@ -32,6 +32,7 @@ locales-all \ ...@@ -32,6 +32,7 @@ locales-all \
sqlite3 \ sqlite3 \
sudo \ sudo \
tzdata \ tzdata \
unixodbc \
unzip \ unzip \
wget wget
...@@ -40,7 +41,7 @@ RUN ln -fs /usr/share/zoneinfo/$TZ /etc/localtime \ ...@@ -40,7 +41,7 @@ RUN ln -fs /usr/share/zoneinfo/$TZ /etc/localtime \
# Snowflake ODBC # Snowflake ODBC
RUN wget --no-directories --recursive --level=1 --no-parent --accept 'snowflake-odbc*.deb' https://sfc-repo.snowflakecomputing.com/odbc/linux/latest/index.html && \ RUN wget --no-directories --recursive --level=1 --no-parent --accept 'snowflake-odbc*.deb' https://sfc-repo.snowflakecomputing.com/odbc/linux/latest/index.html && \
dpkg -i --ignore-depends=unixodbc snowflake-odbc*.deb && \ dpkg -i snowflake-odbc*.deb && \
rm snowflake-odbc*.deb rm snowflake-odbc*.deb
# Set the locale, Locale defaults are necessary for agent to operate correctly # Set the locale, Locale defaults are necessary for agent to operate correctly
...@@ -56,7 +57,7 @@ RUN mkdir /exports && chown $USER:$USER /exports ...@@ -56,7 +57,7 @@ RUN mkdir /exports && chown $USER:$USER /exports
USER $USER USER $USER
# Add the SQLite ODBC information. The main odbcinst.ini is in INFA_HOME directory. # Add the SQLite ODBC information. The main odbcinst.ini is in INFA_HOME directory.
COPY --chown=agent odbcinst.ini /home/agent/.odbcinst.ini ADD odbcinst.ini /home/agent/.odbcinst.ini
# Create directories so that volume mounts pick up the correct users # Create directories so that volume mounts pick up the correct users
RUN mkdir -p ~/databases && \ RUN mkdir -p ~/databases && \
......
...@@ -3,12 +3,3 @@ Description = SQLite3 ODBC Driver ...@@ -3,12 +3,3 @@ Description = SQLite3 ODBC Driver
Driver = /usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so Driver = /usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so
Setup = /usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so Setup = /usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so
UsageCount = 1 UsageCount = 1
[SnowflakeDSIIDriver]
APILevel=1
ConnectFunctions=YYY
Description=Snowflake DSII
Driver=/usr/lib/snowflake/odbc/lib/libSnowflake.so
DriverODBCVer=03.52
SQLLevel=1
UsageCount=1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment