From 897b5704dcdfee7147a443b2c8419521a1cc0c40 Mon Sep 17 00:00:00 2001 From: Lan Phan Date: Sat, 16 Mar 2019 14:17:58 +0700 Subject: [PATCH] update adminer to support SQL Server --- adminer/Dockerfile | 18 +++++++++--------- docker-compose.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/adminer/Dockerfile b/adminer/Dockerfile index cb39977..61ca8d9 100644 --- a/adminer/Dockerfile +++ b/adminer/Dockerfile @@ -9,19 +9,19 @@ VOLUME /sessions # SQL SERVER: ##################################### USER root + 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 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 \ + && apk update \ + && apk add --no-cache --virtual .php-build-dependencies unixodbc-dev freetds-dev \ + && apk add --virtual .php-runtime-dependencies unixodbc freetds \ + && docker-php-ext-configure pdo_odbc --with-pdo-odbc=unixODBC,/usr \ + && docker-php-ext-install pdo_odbc pdo_dblib \ + && apk del .php-build-dependencies \ + && rm -rf /var/cache/apk/* \ ;fi USER adminer diff --git a/docker-compose.yml b/docker-compose.yml index aeb6d16..f5ccf4a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -359,7 +359,7 @@ services: - SA_PASSWORD=${MSSQL_PASSWORD} - ACCEPT_EULA=Y volumes: - - ${DATA_PATH_HOST}/mssql:/var/opt/mssql + - mssql:/var/opt/mssql ports: - "${MSSQL_PORT}:1433" networks: