hoellen/dockerfiles
1
0
Fork 0
mirror of https://github.com/hoellen/dockerfiles.git synced 2025-04-20 04:19:18 +00:00
Code Issues Projects Releases Wiki Activity

[nginx-php] delete empty lines because of build error (automated builds)

Browse Source
This commit is contained in:
hoellen 2017-12-03 14:54:07 +01:00
parent f19488afcc
commit 461b7b8203
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nginx-php/7.1/Dockerfile
View File

@ -122,8 +122,6 @@ ARG CUSTOM_PKGS=" \
COPY rootfs / COPY rootfs /
RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
### Packages installation
&& BUILD_DEPS=" \ && BUILD_DEPS=" \
linux-headers \ linux-headers \
libtool \ libtool \
@ -154,8 +152,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
pcre \ pcre \
zlib \ zlib \
${CUSTOM_PKGS} \ ${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 -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 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 \ && 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 xzf /tmp/nginx-${NGINX_VER}.tar.gz -C /usr/src \
&& tar xzvf /tmp/php-${PHP_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 \ && tar xzf /tmp/libiconv-${LIBICONV_VERSION}.tar.gz -C /usr/src \
### nginx installation
&& cd /usr/src/nginx-${NGINX_VER} \ && cd /usr/src/nginx-${NGINX_VER} \
&& ./configure --with-cc-opt="-O3 -fPIE -fstack-protector-strong" ${NGINX_CONF} \ && ./configure --with-cc-opt="-O3 -fPIE -fstack-protector-strong" ${NGINX_CONF} \
&& make -j ${NB_CORES} \ && make -j ${NB_CORES} \
&& make install \ && make install \
### GNU Libiconv installation
&& cd /usr/src/libiconv-${LIBICONV_VERSION} \ && cd /usr/src/libiconv-${LIBICONV_VERSION} \
&& ./configure --prefix=/usr/local \ && ./configure --prefix=/usr/local \
&& make && make install && libtool --finish /usr/local/lib \ && make && make install && libtool --finish /usr/local/lib \
### PHP installation
&& mv /usr/src/php-${PHP_VER} /usr/src/php \ && mv /usr/src/php-${PHP_VER} /usr/src/php \
&& cd /usr/src/php \ && cd /usr/src/php \
&& ./configure CFLAGS="-O3 -fstack-protector-strong" ${PHP_CONF} \ && ./configure CFLAGS="-O3 -fstack-protector-strong" ${PHP_CONF} \
&& make -j ${NB_CORES} \ && make -j ${NB_CORES} \
&& make install \ && make install \
### Strip, clean, install modules
&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
&& make clean \ && make clean \
&& chmod u+x /usr/local/bin/* /etc/s6.d/*/* \ && chmod u+x /usr/local/bin/* /etc/s6.d/*/* \