Skip to content

Commit c84a57c

Browse files
bestlongbestlong
authored
Merge pull request laradock#1450 from bestlong/increase-install-check
Increase install check
2 parents 21a5d5b + e681728 commit c84a57c

8 files changed

Lines changed: 56 additions & 42 deletions

File tree

‎php-fpm/Dockerfile-56‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,11 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
302302
#####################################
303303
ARG INSTALL_MSSQL=false
304304
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
305-
306-
RUN if [ ${INSTALL_MSSQL} = true ]; then \
307-
apt-get -y install php5-sybase freetds-bin && \
308-
cp /usr/lib/php5/20131226/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20131226/ && \
309-
docker-php-ext-enable mssql pdo pdo_dblib \
305+
RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \
306+
apt-get -y install php5-sybase freetds-bin \
307+
&& cp /usr/lib/php5/20131226/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20131226/ \
308+
&& docker-php-ext-enable pdo_dblib mssql \
309+
&& php -m | grep -q 'mssql' \
310310
;fi
311311

312312
#####################################

‎php-fpm/Dockerfile-70‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -308,26 +308,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
308308
#####################################
309309
# SQL SERVER:
310310
#####################################
311-
312311
ARG INSTALL_MSSQL=false
313312
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
314-
RUN if [ ${INSTALL_MSSQL} = true ]; then \
313+
RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \
315314
#####################################
316315
# Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
317316
#####################################
318317
# Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
319318
apt-get update -yqq \
320-
&& apt-get install -y apt-transport-https \
321-
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
322-
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
323-
&& apt-get update -yqq \
319+
&& apt-get install -y apt-transport-https \
320+
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
321+
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
322+
&& apt-get update -yqq \
324323
# Install Dependencies
325-
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
326-
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
327-
&& locale-gen \
324+
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
325+
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
326+
&& locale-gen \
328327
# Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
329-
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
330-
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
328+
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
329+
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
330+
&& php -m | grep -q 'pdo_sqlsrv' \
331+
&& php -m | grep -q 'sqlsrv' \
331332
;fi
332333

333334
#####################################

‎php-fpm/Dockerfile-71‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -308,24 +308,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
308308
#####################################
309309
# SQL SERVER:
310310
#####################################
311-
312311
ARG INSTALL_MSSQL=false
313312
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
314-
RUN if [ ${INSTALL_MSSQL} = true ]; then \
313+
RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \
315314
#####################################
316315
# Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
317316
#####################################
318317
# Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
319-
apt-get update -yqq && apt-get install -y apt-transport-https \
320-
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
321-
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
322-
&& apt-get update -yqq \
318+
apt-get update -yqq \
319+
&& apt-get install -y apt-transport-https \
320+
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
321+
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
322+
&& apt-get update -yqq \
323323
# Install Dependencies
324-
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
325-
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen \
324+
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
325+
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
326+
&& locale-gen \
326327
# Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
327-
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
328-
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
328+
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
329+
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
330+
&& php -m | grep -q 'pdo_sqlsrv' \
331+
&& php -m | grep -q 'sqlsrv' \
329332
;fi
330333

331334
#####################################

‎php-fpm/Dockerfile-72‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -311,26 +311,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
311311
#####################################
312312
# SQL SERVER:
313313
#####################################
314-
315314
ARG INSTALL_MSSQL=false
316315
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
317-
RUN if [ ${INSTALL_MSSQL} = true ]; then \
316+
RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \
318317
#####################################
319318
# Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
320319
#####################################
321320
# Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
322-
apt-get update -yqq && apt-get install -y apt-transport-https gnupg \
323-
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
324-
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
325-
&& apt-get update -yqq \
326-
321+
apt-get update -yqq \
322+
&& apt-get install -y apt-transport-https gnupg \
323+
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
324+
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
325+
&& apt-get update -yqq \
327326
# Install Dependencies
328-
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
329-
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen \
330-
327+
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
328+
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
329+
&& locale-gen \
331330
# Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
332-
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
333-
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
331+
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
332+
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
333+
&& php -m | grep -q 'pdo_sqlsrv' \
334+
&& php -m | grep -q 'sqlsrv' \
334335
;fi
335336

336337
#####################################

‎workspace/Dockerfile-56‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,9 +540,12 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
540540
ARG INSTALL_MSSQL=false
541541
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
542542

543-
RUN if [ ${INSTALL_MSSQL} = true ]; then \
543+
RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \
544544
apt-get -y install php5.6-sybase freetds-bin freetds-common libsybdb5 \
545+
&& echo "extension=mssql.so" > /etc/php/5.6/cli/conf.d/20-mssql.ini \
545546
&& echo "extension=pdo_dblib.so" > /etc/php/5.6/cli/conf.d/20-pdo_dblib.ini \
547+
&& php -m | grep -q 'mssql' \
548+
&& php -m | grep -q 'pdo_dblib' \
546549
;fi
547550

548551
#####################################

‎workspace/Dockerfile-70‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
536536
ARG INSTALL_MSSQL=true
537537
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
538538

539-
RUN if [ ${INSTALL_MSSQL} = true ]; then \
539+
RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \
540540
#####################################
541541
# The following steps were taken from
542542
# https://github.com/Microsoft/msphpsql/wiki/Install-and-configuration
@@ -563,6 +563,8 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \
563563
locale-gen && \
564564
echo "extension=sqlsrv.so" > /etc/php/7.0/cli/conf.d/20-sqlsrv.ini && \
565565
echo "extension=pdo_sqlsrv.so" > /etc/php/7.0/cli/conf.d/20-pdo_sqlsrv.ini \
566+
&& php -m | grep -q 'sqlsrv' \
567+
&& php -m | grep -q 'pdo_sqlsrv' \
566568
;fi
567569

568570
#####################################

‎workspace/Dockerfile-71‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
536536
ARG INSTALL_MSSQL=false
537537
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
538538

539-
RUN if [ ${INSTALL_MSSQL} = true ]; then \
539+
RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \
540540
#####################################
541541
# The following steps were taken from
542542
# https://github.com/Microsoft/msphpsql/wiki/Install-and-configuration
@@ -563,6 +563,8 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \
563563
locale-gen && \
564564
echo "extension=sqlsrv.so" > /etc/php/7.1/cli/conf.d/20-sqlsrv.ini && \
565565
echo "extension=pdo_sqlsrv.so" > /etc/php/7.1/cli/conf.d/20-pdo_sqlsrv.ini \
566+
&& php -m | grep -q 'sqlsrv' \
567+
&& php -m | grep -q 'pdo_sqlsrv' \
566568
;fi
567569

568570
#####################################

‎workspace/Dockerfile-72‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
536536
ARG INSTALL_MSSQL=false
537537
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
538538

539-
RUN if [ ${INSTALL_MSSQL} = true ]; then \
539+
RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \
540540
#####################################
541541
# The following steps were taken from
542542
# https://github.com/Microsoft/msphpsql/wiki/Install-and-configuration
@@ -563,6 +563,8 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \
563563
locale-gen && \
564564
echo "extension=sqlsrv.so" > /etc/php/7.2/cli/conf.d/20-sqlsrv.ini && \
565565
echo "extension=pdo_sqlsrv.so" > /etc/php/7.2/cli/conf.d/20-pdo_sqlsrv.ini \
566+
&& php -m | grep -q 'sqlsrv' \
567+
&& php -m | grep -q 'pdo_sqlsrv' \
566568
;fi
567569

568570
#####################################

0 commit comments

Comments
 (0)