Skip to content

Commit 72ba0ad

Browse files
committed
fix: ensure that sqlsrv is installed correctly
The 5.10.0 release does NOT include support for PHP 7.3, which caused the install_sqlsrv.sh to fail. However, because we did not have a `set -e` directive associated with the `RUN` declaration that invokes the script, the container built without errors. This patch does two things: - Switches to the 5.9.0 release for installing the sqlsrv extension for PHP 7.3. - Adds a `set -e` directive to the `RUN` line that installs static extensions. Signed-off-by: Matthew Weier O'Phinney <[email protected]>
1 parent 208d48e commit 72ba0ad

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ RUN apt update \
210210
# Build/install static modules that do not have packages
211211
COPY mods-available /mods-available
212212
COPY mods-install /mods-install
213-
RUN for INSTALLER in /mods-install/*.sh;do ${INSTALLER} ; done
213+
RUN set -e; for INSTALLER in /mods-install/*.sh; do ${INSTALLER} ; done
214214

215215
COPY scripts /scripts
216216
RUN chmod a+x /scripts/*

mods-install/install_sqlsrv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
cd tmp
66

77
# Download extension versions from MS
8-
curl -L https://github.com/microsoft/msphpsql/releases/download/v5.10.0/Ubuntu2004-7.3.tar | tar xf - --strip-components=1 Ubuntu2004-7.3/php_pdo_sqlsrv_73_nts.so Ubuntu2004-7.3/php_sqlsrv_73_nts.so
8+
curl -L https://github.com/microsoft/msphpsql/releases/download/v5.9.0/Ubuntu2004-7.3.tar | tar xf - --strip-components=1 Ubuntu2004-7.3/php_pdo_sqlsrv_73_nts.so Ubuntu2004-7.3/php_sqlsrv_73_nts.so
99
curl -L https://github.com/microsoft/msphpsql/releases/download/v5.10.0/Ubuntu2004-7.4.tar | tar xf - --strip-components=1 Ubuntu2004-7.4/php_pdo_sqlsrv_74_nts.so Ubuntu2004-7.4/php_sqlsrv_74_nts.so
1010
curl -L https://github.com/microsoft/msphpsql/releases/download/v5.10.0/Ubuntu2004-8.0.tar | tar xf - --strip-components=1 Ubuntu2004-8.0/php_pdo_sqlsrv_80_nts.so Ubuntu2004-8.0/php_sqlsrv_80_nts.so
1111
curl -L https://github.com/microsoft/msphpsql/releases/download/v5.10.0/Ubuntu2004-8.1.tar | tar xf - --strip-components=1 Ubuntu2004-8.1/php_pdo_sqlsrv_81_nts.so Ubuntu2004-8.1/php_sqlsrv_81_nts.so

0 commit comments

Comments
 (0)