From 9185c699e43f765ee5241cdef2d8dfb8ad707d03 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 17 Mar 2023 18:53:54 +0100 Subject: [PATCH] Revert "Merge pull request #164 from andrewnicols/buildsqlsrv" This reverts commit 50f9dd3e8e668bad3a4059954ba7c17ce2f09c7e, reversing changes made to b532e39e551026cdd65764558819dc7a6e5e925c. Part of #168, this reverts #164 --- root/tmp/setup/sqlsrv-extension.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/root/tmp/setup/sqlsrv-extension.sh b/root/tmp/setup/sqlsrv-extension.sh index 595df7c..f00385f 100755 --- a/root/tmp/setup/sqlsrv-extension.sh +++ b/root/tmp/setup/sqlsrv-extension.sh @@ -2,6 +2,11 @@ set -e +if [[ ${TARGETPLATFORM} != "linux/amd64" ]]; then + echo "sqlsrv extension not available for ${TARGETPLATFORM} architecture, skipping" + exit 0 +fi + # Packages for build. BUILD_PACKAGES="gnupg unixodbc-dev" @@ -19,16 +24,17 @@ apt-get install -y --no-install-recommends apt-transport-https \ # Install Microsoft dependencies for sqlsrv echo "Downloading sqlsrv files" curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - -curl https://packages.microsoft.com/config/debian/11/prod.list -o /etc/apt/sources.list.d/mssql-release.list +# TODO, bullseye should be 11, but the msodbcsql17 package is not available yet, hence using buster (10) one. +curl https://packages.microsoft.com/config/debian/10/prod.list -o /etc/apt/sources.list.d/mssql-release.list apt-get update echo "Install msodbcsql" -ACCEPT_EULA=Y apt-get install -y msodbcsql18 +ACCEPT_EULA=Y apt-get install -y msodbcsql17 ln -fsv /opt/mssql-tools/bin/* /usr/bin -# Need 5.11.0 (or later) for PHP 8.2 support -pecl install sqlsrv-5.11.0 +# Need 5.10.1 (or later) for PHP 8.2 support +pecl install sqlsrv-5.10.1 docker-php-ext-enable sqlsrv # Keep our image size down..