From e0d7229e95b58af4905add4686f698cd367f38ca Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Tue, 12 Feb 2019 21:24:06 +0800 Subject: [PATCH] fix adminer INSTALL_MSSQL build fail. (#1991) 1. adminer:4 now use php 7.3, but extension sqlsrv and pdo_sqlsrv not support. 2. add pdo_dblib to support mssql. --- adminer/Dockerfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/adminer/Dockerfile b/adminer/Dockerfile index 1cf4d3de..cb399771 100644 --- a/adminer/Dockerfile +++ b/adminer/Dockerfile @@ -13,11 +13,15 @@ ARG INSTALL_MSSQL=false ENV INSTALL_MSSQL ${INSTALL_MSSQL} RUN if [ ${INSTALL_MSSQL} = true ]; then \ set -xe \ - && apk --update add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc unixodbc-dev \ - && pecl channel-update pecl.php.net \ - && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \ - && echo "extension=sqlsrv.so" > /usr/local/etc/php/conf.d/20-sqlsrv.ini \ - && echo "extension=pdo_sqlsrv.so" > /usr/local/etc/php/conf.d/20-pdo_sqlsrv.ini \ + # && apk --update add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc unixodbc-dev \ + # && pecl channel-update pecl.php.net \ + # && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \ + # && echo "extension=sqlsrv.so" > /usr/local/etc/php/conf.d/20-sqlsrv.ini \ + # && echo "extension=pdo_sqlsrv.so" > /usr/local/etc/php/conf.d/20-pdo_sqlsrv.ini \ + && apk --update add --no-cache freetds unixodbc \ + && apk --update add --no-cache --virtual .build-deps $PHPIZE_DEPS freetds-dev unixodbc-dev \ + && docker-php-ext-install pdo_dblib \ + && apk del .build-deps \ ;fi USER adminer