From 722f7d09c0e7e97d71bbe434de3879485cad0a68 Mon Sep 17 00:00:00 2001 From: Zgoo Date: Fri, 12 Jan 2018 01:43:25 +0800 Subject: [PATCH 1/2] Remove blank lines Just do it to avoid Warning message on building the php-fpm container --- php-fpm/Dockerfile-71 | 3 --- 1 file changed, 3 deletions(-) diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 7e7fb9d0..45955e05 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -224,7 +224,6 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Fix dependencies for PHPUnit within aerospike extension apt-get update -yqq && \ apt-get -y install sudo wget && \ - # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \ && mkdir -p aerospike-client-php \ @@ -326,11 +325,9 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \ && apt-get update -yqq \ - # Install Dependencies && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen \ - # Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version. && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \ && docker-php-ext-enable pdo_sqlsrv sqlsrv \ From f27b3aa4bea5f66a8cb7d03ce09d275f3c4cdaec Mon Sep 17 00:00:00 2001 From: Zgoo Date: Fri, 12 Jan 2018 02:04:02 +0800 Subject: [PATCH 2/2] Remove blank lines Just do it to avoid Warning message on building the php-fpm container --- php-fpm/Dockerfile-70 | 2 -- 1 file changed, 2 deletions(-) diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 6566d830..e6ad960b 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -318,12 +318,10 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \ && apt-get update -yqq \ - # Install Dependencies && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - # Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version. && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \ && docker-php-ext-enable pdo_sqlsrv sqlsrv \