Skip to content

Commit

Permalink
remove ODBC preview binaries (#728)
Browse files Browse the repository at this point in the history
* remove ODBC preview binaries

* update to public odbc 17
  • Loading branch information
lilgreenbird authored Mar 24, 2018
1 parent ba66341 commit 1958cfd
Show file tree
Hide file tree
Showing 16 changed files with 8 additions and 13 deletions.
15 changes: 8 additions & 7 deletions Dockerfile-msphpsql
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 0 additions & 6 deletions ODBC 17 binaries preview/README.md

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed ODBC 17 binaries preview/Windows/x64/msodbcsql.msi
Binary file not shown.
Binary file removed ODBC 17 binaries preview/Windows/x86/msodbcsql.msi
Binary file not shown.

0 comments on commit 1958cfd

Please sign in to comment.