mirror of
https://github.com/hoellen/dockerfiles.git
synced 2025-04-19 20:09:16 +00:00
[nginx-php] delete empty lines because of build error (automated builds)
This commit is contained in:
parent
f19488afcc
commit
461b7b8203
@ -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/*/* \
|
||||
|
Loading…
x
Reference in New Issue
Block a user