Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try newer version of odbc driver #9484

Merged
merged 2 commits into from
Mar 10, 2020
Merged

Try newer version of odbc driver #9484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
add2014
Try newer version of odbc driver
filimonov Mar 3, 2020
cf68545
sync up clickhouse-stateless-with-coverage-test with clickhouse-state…
filimonov Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 ...eries/bugs/01086_odbc_roundtrip.reference → ..._stateless/01086_odbc_roundtrip.reference
View file
Open in desktop
File renamed without changes.
0 ...sts/queries/bugs/01086_odbc_roundtrip.sql → ...ries/0_stateless/01086_odbc_roundtrip.sql
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions docker/test/stateless/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# docker build -t yandex/clickhouse-stateless-test .
FROM yandex/clickhouse-deb-builder

ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.3.20200115/clickhouse-odbc-1.1.3-Linux.tar.gz"
ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"

RUN apt-get update -y \
&& env DEBIAN_FRONTEND=noninteractive \
Expand Down Expand Up @@ -29,7 +29,6 @@ RUN apt-get update -y \
gdb \
lsof \
llvm-8 \
vim \
unixodbc \
wget

Expand Down
15 changes: 14 additions & 1 deletion docker/test/stateless_with_coverage/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# docker build -t yandex/clickhouse-stateless-with-coverage-test .
# TODO: that can be based on yandex/clickhouse-stateless-test (llvm version and CMD differs)
FROM yandex/clickhouse-deb-builder

ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"

RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" >> /etc/apt/sources.list

RUN apt-get update -y \
Expand All @@ -20,14 +23,24 @@ RUN apt-get update -y \
curl \
sudo \
openssl \
ncdu \
netcat-openbsd \
telnet \
tree \
moreutils \
brotli \
gdb \
lsof \
llvm-9
llvm-9 \
unixodbc \
wget

RUN mkdir -p /tmp/clickhouse-odbc-tmp \
&& wget --quiet -O - ${odbc_driver_url} | tar --strip-components=1 -xz -C /tmp/clickhouse-odbc-tmp \
&& cp /tmp/clickhouse-odbc-tmp/lib64/*.so /usr/local/lib/ \
&& odbcinst -i -d -f /tmp/clickhouse-odbc-tmp/share/doc/clickhouse-odbc/config/odbcinst.ini.sample \
&& odbcinst -i -s -l -f /tmp/clickhouse-odbc-tmp/share/doc/clickhouse-odbc/config/odbc.ini.sample \
&& rm -rf /tmp/clickhouse-odbc-tmp

ENV TZ=Europe/Moscow
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
Expand Down