Skip to content

Commit 715c217

Browse files
authored
Merge pull request laradock#1347 from zgoo/zgoo-laradock
Remove blank lines in php-fpm/Dockerfile70&71
2 parents acbe716 + f27b3aa commit 715c217

2 files changed

Lines changed: 0 additions & 5 deletions

File tree

php-fpm/Dockerfile-70

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,10 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \
318318
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
319319
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
320320
&& apt-get update -yqq \
321-
322321
# Install Dependencies
323322
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
324323
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
325324
&& locale-gen \
326-
327325
# Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
328326
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
329327
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \

php-fpm/Dockerfile-71

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
224224
# Fix dependencies for PHPUnit within aerospike extension
225225
apt-get update -yqq && \
226226
apt-get -y install sudo wget && \
227-
228227
# Install the php aerospike extension
229228
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \
230229
&& mkdir -p aerospike-client-php \
@@ -326,11 +325,9 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \
326325
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
327326
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
328327
&& apt-get update -yqq \
329-
330328
# Install Dependencies
331329
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
332330
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen \
333-
334331
# Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
335332
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
336333
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \

0 commit comments

Comments
 (0)