From eb01bac57ef6ae52c01a18c34a1346adc4397abf Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@schrodinger.io>
Date: Sat, 29 Apr 2017 01:13:38 +0200
Subject: [PATCH] update nginx-php

---
 nginx-php/Dockerfile                          | 58 ++++++++++++-------
 .../{usr/local => php}/etc/php-fpm.conf       |  3 +-
 2 files changed, 40 insertions(+), 21 deletions(-)
 rename nginx-php/rootfs/{usr/local => php}/etc/php-fpm.conf (86%)

diff --git a/nginx-php/Dockerfile b/nginx-php/Dockerfile
index 5bb19ce..ac9053e 100644
--- a/nginx-php/Dockerfile
+++ b/nginx-php/Dockerfile
@@ -3,6 +3,10 @@ FROM alpine:3.5
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.0
+ARG PHP_VER=7.1.4
+ARG LIBICONV_VERSION=1.15
+
+ARG PHP_MIRROR=http://ch1.php.net
 
 ARG NGINX_CONF=" \
     --prefix=/nginx \
@@ -20,15 +24,20 @@ ARG NGINX_CONF=" \
     --without-http_empty_gif_module \
     --without-http_browser_module"
 
-ARG PHP_VER=7.1.4
-ARG PHP_MIRROR=http://ch1.php.net
-
-ARG LIBICONV_VERSION=1.15
-
 ARG PHP_CONF=" \
+    --prefix=/usr \
+    --libdir=/usr/lib/php \
+    --datadir=/usr/share/php \
+    --sysconfdir=/php/etc \
+    --localstatedir=/php/var \
+    --with-pear=/usr/share/php \
+    --with-config-file-scan-dir=/php/conf.d \
+    --with-config-file-path=/php \
+    --with-pic \
+    --disable-short-tags \
+    --without-readline \
+    --enable-bcmath=shared \
     --enable-fpm \
-    --with-config-file-path="/php" \
-    --with-config-file-scan-dir="/php/conf.d" \
     --disable-cgi \
     --enable-mysqlnd \
     --enable-mbstring \
@@ -36,10 +45,17 @@ ARG PHP_CONF=" \
     --with-libedit \
     --with-openssl \
     --with-iconv=/usr/local \
+    --with-gd \
+    --with-jpeg-dir \
+    --with-png-dir \
+    --with-webp-dir \
+    --with-xpm-dir=no \
+    --with-freetype-dir \
+    --enable-gd-native-ttf \
+    --disable-gd-jis-conv \
     --with-zlib"
 
 ARG PHP_EXT_LIST=" \
-    gd \
     mysqli \
     ctype \
     dom \
@@ -74,7 +90,16 @@ ARG CUSTOM_BUILD_PKGS=" \
     gmp-dev \
     libmcrypt-dev \
     icu-dev \
-    postgresql-dev"
+    postgresql-dev \
+    libpng-dev \
+    libwebp-dev \
+    gd-dev \
+    libjpeg-turbo-dev \
+    libxpm-dev \
+    libedit-dev \
+    libxml2-dev \
+    libressl-dev \
+    sqlite-dev"
 
 ARG CUSTOM_PKGS=" \
     freetype \
@@ -85,9 +110,6 @@ ARG CUSTOM_PKGS=" \
     icu \
     libpq"
 
-ENV MEMORY_LIMIT=512M \
-    UPLOAD_MAX_SIZE=1G
-
 COPY rootfs /
 
 RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
@@ -108,12 +130,8 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     make \
     pkgconf \
     curl-dev \
-    libedit-dev \
-    libxml2-dev \
-    libressl-dev \
-    sqlite-dev \
     ca-certificates \
-   ${CUSTOM_BUILD_PKGS}" \
+    ${CUSTOM_BUILD_PKGS}" \
  && apk -U add \
     ${BUILD_DEPS} \
     s6 \
@@ -122,10 +140,10 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
     libedit \
     libxml2 \
     libressl \
+    libwebp \
+    gd \
     pcre \
     zlib \
-    s6 \
-    su-exec \
     ${CUSTOM_PKGS} \
 
 ### Source downloading
@@ -154,7 +172,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
 ### PHP installation
  && mv /usr/src/php-${PHP_VER} /usr/src/php \
  && cd /usr/src/php \
- && ./configure ${PHP_CONF} \
+ && ./configure CFLAGS="-O3 -fstack-protector-strong" ${PHP_CONF} \
  && make -j ${NB_CORES} \
  && make install \
 
diff --git a/nginx-php/rootfs/usr/local/etc/php-fpm.conf b/nginx-php/rootfs/php/etc/php-fpm.conf
similarity index 86%
rename from nginx-php/rootfs/usr/local/etc/php-fpm.conf
rename to nginx-php/rootfs/php/etc/php-fpm.conf
index 808edd7..130c121 100644
--- a/nginx-php/rootfs/usr/local/etc/php-fpm.conf
+++ b/nginx-php/rootfs/php/etc/php-fpm.conf
@@ -10,6 +10,7 @@ pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 6
 chdir = /
+request_terminate_timeout = 0
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 php_admin_value[post_max_size] = <UPLOAD_MAX_SIZE>
 php_admin_value[upload_max_filesize] = <UPLOAD_MAX_SIZE>
@@ -17,4 +18,4 @@ php_admin_value[max_execution_time] = 10800
 php_admin_value[max_input_time] = 3600
 php_admin_value[expose_php] = Off
 php_admin_value[memory_limit] = <MEMORY_LIMIT>
-include=/php/php-fpm.d/*.conf
\ No newline at end of file
+php_admin_value[session.save_path] = "/data/session"