diff --git a/Dockerfile-msphpsql b/Dockerfile-msphpsql index 9a2d89b8..7de26f1f 100644 --- a/Dockerfile-msphpsql +++ b/Dockerfile-msphpsql @@ -37,6 +37,13 @@ RUN locale-gen en_US RUN locale-gen en_US.UTF-8 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' +#install ODBC driver +RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - +RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/mssql-release.list + +RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && ACCEPT_EULA=Y apt-get install -y msodbcsql17 mssql-tools +ENV PATH="/opt/mssql-tools/bin:${PATH}" + #install coveralls RUN pip install --upgrade pip && pip install cpp-coveralls @@ -45,14 +52,8 @@ RUN pip install --upgrade pip && pip install cpp-coveralls #another option is to copy source to build directory on image RUN mkdir -p $PHPSQLDIR COPY . $PHPSQLDIR - -#install ODBC 17 preview driver -WORKDIR $PHPSQLDIR -RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && ACCEPT_EULA=Y dpkg -i "./ODBC 17 binaries preview/Ubuntu 16/msodbcsql_17.0.0.5-1_amd64.deb" -RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && ACCEPT_EULA=Y dpkg -i "./ODBC 17 binaries preview/Ubuntu 16/mssql-tools_17.0.0.5-1_amd64.deb" -ENV PATH="/opt/mssql-tools/bin:${PATH}" - WORKDIR $PHPSQLDIR/source/ + RUN chmod +x ./packagize.sh RUN /bin/bash -c "./packagize.sh" diff --git a/ODBC 17 binaries preview/Debian 8/msodbcsql_17.0.0.5-1_amd64.deb b/ODBC 17 binaries preview/Debian 8/msodbcsql_17.0.0.5-1_amd64.deb deleted file mode 100644 index 673fe035..00000000 Binary files a/ODBC 17 binaries preview/Debian 8/msodbcsql_17.0.0.5-1_amd64.deb and /dev/null differ diff --git a/ODBC 17 binaries preview/Debian 8/mssql-tools_17.0.0.5-1_amd64.deb b/ODBC 17 binaries preview/Debian 8/mssql-tools_17.0.0.5-1_amd64.deb deleted file mode 100644 index fc818465..00000000 Binary files a/ODBC 17 binaries preview/Debian 8/mssql-tools_17.0.0.5-1_amd64.deb and /dev/null differ diff --git a/ODBC 17 binaries preview/Debian 9/msodbcsql_17.0.0.5-1_amd64.deb b/ODBC 17 binaries preview/Debian 9/msodbcsql_17.0.0.5-1_amd64.deb deleted file mode 100644 index d9cc02a8..00000000 Binary files a/ODBC 17 binaries preview/Debian 9/msodbcsql_17.0.0.5-1_amd64.deb and /dev/null differ diff --git a/ODBC 17 binaries preview/Debian 9/mssql-tools_17.0.0.5-1_amd64.deb b/ODBC 17 binaries preview/Debian 9/mssql-tools_17.0.0.5-1_amd64.deb deleted file mode 100644 index 58e697f1..00000000 Binary files a/ODBC 17 binaries preview/Debian 9/mssql-tools_17.0.0.5-1_amd64.deb and /dev/null differ diff --git a/ODBC 17 binaries preview/README.md b/ODBC 17 binaries preview/README.md deleted file mode 100644 index c1a0a405..00000000 --- a/ODBC 17 binaries preview/README.md +++ /dev/null @@ -1,6 +0,0 @@ - -The ODBC driver 17 preview binaries in this directory are required in order to use Always Encrypted functionality. Please note that these drivers should be considered to be preview versions -- they should not be used in production and are not supported by Microsoft. They will be replaced upon the official release of ODBC driver 17. - -On Windows, the ODBC 17 preview binaries require the Visual C/C++ 2013 runtime libraries installed separately. These are installed with the [Visual Studio C++ 2013 Redistributable](https://www.microsoft.com/en-ca/download/details.aspx?id=40784) or with the [SQL Server command line utilities](https://www.microsoft.com/en-ca/download/details.aspx?id=53591). Once you have these, simply run the msi to install. - -For instructions on installing the binaries on Linux platforms, please see [this page](https://github.com/Microsoft/msphpsql/wiki/Install-and-configuration#odbc-17-linux-installation). diff --git a/ODBC 17 binaries preview/Red Hat 7/msodbcsql-17.0.0.5-1.x86_64.rpm b/ODBC 17 binaries preview/Red Hat 7/msodbcsql-17.0.0.5-1.x86_64.rpm deleted file mode 100644 index 305a16a6..00000000 Binary files a/ODBC 17 binaries preview/Red Hat 7/msodbcsql-17.0.0.5-1.x86_64.rpm and /dev/null differ diff --git a/ODBC 17 binaries preview/Red Hat 7/mssql-tools-17.0.0.5-1.x86_64.rpm b/ODBC 17 binaries preview/Red Hat 7/mssql-tools-17.0.0.5-1.x86_64.rpm deleted file mode 100644 index effad031..00000000 Binary files a/ODBC 17 binaries preview/Red Hat 7/mssql-tools-17.0.0.5-1.x86_64.rpm and /dev/null differ diff --git a/ODBC 17 binaries preview/SUSE 12/msodbcsql-17.0.0.5-1.x86_64.rpm b/ODBC 17 binaries preview/SUSE 12/msodbcsql-17.0.0.5-1.x86_64.rpm deleted file mode 100644 index 83ea4e58..00000000 Binary files a/ODBC 17 binaries preview/SUSE 12/msodbcsql-17.0.0.5-1.x86_64.rpm and /dev/null differ diff --git a/ODBC 17 binaries preview/SUSE 12/mssql-tools-17.0.0.5-1.x86_64.rpm b/ODBC 17 binaries preview/SUSE 12/mssql-tools-17.0.0.5-1.x86_64.rpm deleted file mode 100644 index 4dd1a1b2..00000000 Binary files a/ODBC 17 binaries preview/SUSE 12/mssql-tools-17.0.0.5-1.x86_64.rpm and /dev/null differ diff --git a/ODBC 17 binaries preview/Ubuntu 16/msodbcsql_17.0.0.5-1_amd64.deb b/ODBC 17 binaries preview/Ubuntu 16/msodbcsql_17.0.0.5-1_amd64.deb deleted file mode 100644 index f3ed15f8..00000000 Binary files a/ODBC 17 binaries preview/Ubuntu 16/msodbcsql_17.0.0.5-1_amd64.deb and /dev/null differ diff --git a/ODBC 17 binaries preview/Ubuntu 16/mssql-tools_17.0.0.5-1_amd64.deb b/ODBC 17 binaries preview/Ubuntu 16/mssql-tools_17.0.0.5-1_amd64.deb deleted file mode 100644 index f1141cee..00000000 Binary files a/ODBC 17 binaries preview/Ubuntu 16/mssql-tools_17.0.0.5-1_amd64.deb and /dev/null differ diff --git a/ODBC 17 binaries preview/Ubuntu 17/msodbcsql_17.0.0.5-1_amd64.deb b/ODBC 17 binaries preview/Ubuntu 17/msodbcsql_17.0.0.5-1_amd64.deb deleted file mode 100644 index 510ceb09..00000000 Binary files a/ODBC 17 binaries preview/Ubuntu 17/msodbcsql_17.0.0.5-1_amd64.deb and /dev/null differ diff --git a/ODBC 17 binaries preview/Ubuntu 17/mssql-tools_17.0.0.5-1_amd64.deb b/ODBC 17 binaries preview/Ubuntu 17/mssql-tools_17.0.0.5-1_amd64.deb deleted file mode 100644 index 5e161efc..00000000 Binary files a/ODBC 17 binaries preview/Ubuntu 17/mssql-tools_17.0.0.5-1_amd64.deb and /dev/null differ diff --git a/ODBC 17 binaries preview/Windows/x64/msodbcsql.msi b/ODBC 17 binaries preview/Windows/x64/msodbcsql.msi deleted file mode 100644 index 8a2dfcca..00000000 Binary files a/ODBC 17 binaries preview/Windows/x64/msodbcsql.msi and /dev/null differ diff --git a/ODBC 17 binaries preview/Windows/x86/msodbcsql.msi b/ODBC 17 binaries preview/Windows/x86/msodbcsql.msi deleted file mode 100644 index 8356cb36..00000000 Binary files a/ODBC 17 binaries preview/Windows/x86/msodbcsql.msi and /dev/null differ