diff --git a/ci/get_base_img_hash.sh b/ci/get_base_img_hash.sh index 74a032539..01050c725 100644 --- a/ci/get_base_img_hash.sh +++ b/ci/get_base_img_hash.sh @@ -5,5 +5,5 @@ set -eu export LC_ALL=C -IMG_HASH_DOCKER_IMAGE_DIR="$(find $ROOT_DIR/metapkg -type f -print0 | sort -z | xargs -0 sha1sum -z | sha1sum | cut -d \ -f1)" +IMG_HASH_DOCKER_IMAGE_DIR="$(find $ROOT_DIR/metapkg $ROOT_DIR/docker_build -type f -print0 | sort -z | xargs -0 sha1sum -z | sha1sum | cut -d \ -f1)" echo "rebuild_flag:8:$IMG_HASH_DOCKER_IMAGE_DIR" | sha1sum | cut -d \ -f1 diff --git a/docker_build/target_dl_base_linux_w_db_bin_dependencies/Dockerfile b/docker_build/target_dl_base_linux_w_db_bin_dependencies/Dockerfile index e220044bc..a0fe3616e 100644 --- a/docker_build/target_dl_base_linux_w_db_bin_dependencies/Dockerfile +++ b/docker_build/target_dl_base_linux_w_db_bin_dependencies/Dockerfile @@ -7,3 +7,7 @@ RUN chmod a+x /tmp/scripts/*.sh && \ --exit-on-error \ /tmp/scripts && \ rm -rf /tmp/scripts + +# Configure libraries for MSSQL +RUN cat /usr/share/tdsodbc/odbcinst.ini >> /etc/odbcinst.ini +ENV LD_LIBRARY_PATH $LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu/odbc diff --git a/lib/dl_sqlalchemy_mssql/README.md b/lib/dl_sqlalchemy_mssql/README.md new file mode 100644 index 000000000..01ca9ba2b --- /dev/null +++ b/lib/dl_sqlalchemy_mssql/README.md @@ -0,0 +1 @@ +# MSSQL connector for DataLens diff --git a/lib/dl_sqlalchemy_mssql/README.rst b/lib/dl_sqlalchemy_mssql/README.rst deleted file mode 100644 index cd1841429..000000000 --- a/lib/dl_sqlalchemy_mssql/README.rst +++ /dev/null @@ -1,15 +0,0 @@ -BI MSSQL SQLAlchemy dialect -================================ - -A subclass of the standard mssql dialect with datalens-backend-specific modifications (e.g. parameterized queries with GROUP BY: https://github.com/level12/sqlalchemy_pyodbc_mssql) - - -Connection Parameters -===================== - -Syntax for the connection string: - - .. code-block:: python - - 'bi_mssql+pyodbc:///DRIVER={FreeTDS};Server=;Port=;Database=;' - 'UID=;PWD=;TDS_Version=8.0' diff --git a/lib/dl_sqlalchemy_mssql/pyproject.toml b/lib/dl_sqlalchemy_mssql/pyproject.toml index 59b5f6aaa..549a8cf92 100644 --- a/lib/dl_sqlalchemy_mssql/pyproject.toml +++ b/lib/dl_sqlalchemy_mssql/pyproject.toml @@ -6,7 +6,7 @@ description = "BI MSSQL SQLAlchemy Dialect" authors = ["DataLens Team "] packages = [{include = "dl_sqlalchemy_mssql"}] license = "Apache 2.0" -readme = "README.rst" +readme = "README.md" [tool.poetry.dependencies]