From 461b7b820361f265cd10ae481ce05d333b3c3b4a Mon Sep 17 00:00:00 2001
From: hoellen <info@hoellen.eu>
Date: Sun, 3 Dec 2017 14:54:07 +0100
Subject: [PATCH] [nginx-php] delete empty lines because of build error
(automated builds)
---
nginx-php/7.1/Dockerfile | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/nginx-php/7.1/Dockerfile b/nginx-php/7.1/Dockerfile
index 4efbfd5..8686151 100644
--- a/nginx-php/7.1/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -122,8 +122,6 @@ ARG CUSTOM_PKGS=" \
COPY rootfs /
RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
-
-### Packages installation
&& BUILD_DEPS=" \
linux-headers \
libtool \
@@ -154,8 +152,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
pcre \
zlib \
${CUSTOM_PKGS} \
-
-### Source downloading
&& wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz -O /tmp/nginx-${NGINX_VER}.tar.gz \
&& wget http://nginx.org/download/nginx-${NGINX_VER}.tar.gz.asc -O /tmp/nginx-${NGINX_VER}.tar.gz.asc \
&& wget ${PHP_MIRROR}/get/php-${PHP_VER}.tar.gz/from/this/mirror -O /tmp/php-${PHP_VER}.tar.gz \
@@ -166,26 +162,18 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
&& tar xzf /tmp/nginx-${NGINX_VER}.tar.gz -C /usr/src \
&& tar xzvf /tmp/php-${PHP_VER}.tar.gz -C /usr/src \
&& tar xzf /tmp/libiconv-${LIBICONV_VERSION}.tar.gz -C /usr/src \
-
-### nginx installation
&& cd /usr/src/nginx-${NGINX_VER} \
&& ./configure --with-cc-opt="-O3 -fPIE -fstack-protector-strong" ${NGINX_CONF} \
&& make -j ${NB_CORES} \
&& make install \
-
-### GNU Libiconv installation
&& cd /usr/src/libiconv-${LIBICONV_VERSION} \
&& ./configure --prefix=/usr/local \
&& make && make install && libtool --finish /usr/local/lib \
-
-### PHP installation
&& mv /usr/src/php-${PHP_VER} /usr/src/php \
&& cd /usr/src/php \
&& ./configure CFLAGS="-O3 -fstack-protector-strong" ${PHP_CONF} \
&& make -j ${NB_CORES} \
&& make install \
-
-### Strip, clean, install modules
&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
&& make clean \
&& chmod u+x /usr/local/bin/* /etc/s6.d/*/* \