diff --git a/5.6/alpine3.4/cli/Dockerfile b/5.6/alpine3.4/cli/Dockerfile index 9a38ca126a..fe4f716de8 100644 --- a/5.6/alpine3.4/cli/Dockerfile +++ b/5.6/alpine3.4/cli/Dockerfile @@ -112,6 +112,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/5.6/alpine3.4/fpm/Dockerfile b/5.6/alpine3.4/fpm/Dockerfile index 8b4ff92306..3cab917ac7 100644 --- a/5.6/alpine3.4/fpm/Dockerfile +++ b/5.6/alpine3.4/fpm/Dockerfile @@ -113,6 +113,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/5.6/alpine3.4/zts/Dockerfile b/5.6/alpine3.4/zts/Dockerfile index 0fdc4ecf93..88176968a8 100644 --- a/5.6/alpine3.4/zts/Dockerfile +++ b/5.6/alpine3.4/zts/Dockerfile @@ -113,6 +113,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile index afaab349bf..b8c17353a3 100644 --- a/5.6/jessie/apache/Dockerfile +++ b/5.6/jessie/apache/Dockerfile @@ -191,6 +191,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/5.6/jessie/cli/Dockerfile b/5.6/jessie/cli/Dockerfile index 3df81afa67..f5b92eaf12 100644 --- a/5.6/jessie/cli/Dockerfile +++ b/5.6/jessie/cli/Dockerfile @@ -132,6 +132,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/5.6/jessie/fpm/Dockerfile b/5.6/jessie/fpm/Dockerfile index fd451612e7..4ef982fd57 100644 --- a/5.6/jessie/fpm/Dockerfile +++ b/5.6/jessie/fpm/Dockerfile @@ -133,6 +133,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/5.6/jessie/zts/Dockerfile b/5.6/jessie/zts/Dockerfile index 25fa817474..3d7cf52352 100644 --- a/5.6/jessie/zts/Dockerfile +++ b/5.6/jessie/zts/Dockerfile @@ -133,6 +133,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.0/alpine3.4/cli/Dockerfile b/7.0/alpine3.4/cli/Dockerfile index c2ca96544e..cbf1137ead 100644 --- a/7.0/alpine3.4/cli/Dockerfile +++ b/7.0/alpine3.4/cli/Dockerfile @@ -112,6 +112,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.0/alpine3.4/fpm/Dockerfile b/7.0/alpine3.4/fpm/Dockerfile index 2ca592f349..4d3d81216b 100644 --- a/7.0/alpine3.4/fpm/Dockerfile +++ b/7.0/alpine3.4/fpm/Dockerfile @@ -113,6 +113,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.0/alpine3.4/zts/Dockerfile b/7.0/alpine3.4/zts/Dockerfile index 8e0ccfa4a1..1ac8abd2c2 100644 --- a/7.0/alpine3.4/zts/Dockerfile +++ b/7.0/alpine3.4/zts/Dockerfile @@ -113,6 +113,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile index 470c650391..c44ca5d534 100644 --- a/7.0/jessie/apache/Dockerfile +++ b/7.0/jessie/apache/Dockerfile @@ -191,6 +191,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.0/jessie/cli/Dockerfile b/7.0/jessie/cli/Dockerfile index d8faab5a99..9823876ea7 100644 --- a/7.0/jessie/cli/Dockerfile +++ b/7.0/jessie/cli/Dockerfile @@ -132,6 +132,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.0/jessie/fpm/Dockerfile b/7.0/jessie/fpm/Dockerfile index 256d38ea66..a77c0564cd 100644 --- a/7.0/jessie/fpm/Dockerfile +++ b/7.0/jessie/fpm/Dockerfile @@ -133,6 +133,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.0/jessie/zts/Dockerfile b/7.0/jessie/zts/Dockerfile index edba9bd895..eba52dcb93 100644 --- a/7.0/jessie/zts/Dockerfile +++ b/7.0/jessie/zts/Dockerfile @@ -133,6 +133,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.1/alpine3.4/cli/Dockerfile b/7.1/alpine3.4/cli/Dockerfile index 7ea727bf3c..ec3f0a8a16 100644 --- a/7.1/alpine3.4/cli/Dockerfile +++ b/7.1/alpine3.4/cli/Dockerfile @@ -112,6 +112,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.1/alpine3.4/fpm/Dockerfile b/7.1/alpine3.4/fpm/Dockerfile index dfcb91c586..c05db7c046 100644 --- a/7.1/alpine3.4/fpm/Dockerfile +++ b/7.1/alpine3.4/fpm/Dockerfile @@ -113,6 +113,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.1/alpine3.4/zts/Dockerfile b/7.1/alpine3.4/zts/Dockerfile index 5ff71fd886..52ed5b5b0e 100644 --- a/7.1/alpine3.4/zts/Dockerfile +++ b/7.1/alpine3.4/zts/Dockerfile @@ -113,6 +113,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile index 8132b39a28..c1faca3af4 100644 --- a/7.1/jessie/apache/Dockerfile +++ b/7.1/jessie/apache/Dockerfile @@ -191,6 +191,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.1/jessie/cli/Dockerfile b/7.1/jessie/cli/Dockerfile index 649e847d20..8ba2865169 100644 --- a/7.1/jessie/cli/Dockerfile +++ b/7.1/jessie/cli/Dockerfile @@ -132,6 +132,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.1/jessie/fpm/Dockerfile b/7.1/jessie/fpm/Dockerfile index 31e7d45b5a..0cff5757cc 100644 --- a/7.1/jessie/fpm/Dockerfile +++ b/7.1/jessie/fpm/Dockerfile @@ -133,6 +133,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.1/jessie/zts/Dockerfile b/7.1/jessie/zts/Dockerfile index ce60c139ae..b0a726540f 100644 --- a/7.1/jessie/zts/Dockerfile +++ b/7.1/jessie/zts/Dockerfile @@ -133,6 +133,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.2/alpine3.6/cli/Dockerfile b/7.2/alpine3.6/cli/Dockerfile index fcda9c1b49..80486dcb7e 100644 --- a/7.2/alpine3.6/cli/Dockerfile +++ b/7.2/alpine3.6/cli/Dockerfile @@ -113,6 +113,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.2/alpine3.6/fpm/Dockerfile b/7.2/alpine3.6/fpm/Dockerfile index bb723512d0..e214f955c4 100644 --- a/7.2/alpine3.6/fpm/Dockerfile +++ b/7.2/alpine3.6/fpm/Dockerfile @@ -114,6 +114,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.2/alpine3.6/zts/Dockerfile b/7.2/alpine3.6/zts/Dockerfile index 7933818ec2..58ea1bc020 100644 --- a/7.2/alpine3.6/zts/Dockerfile +++ b/7.2/alpine3.6/zts/Dockerfile @@ -114,6 +114,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.2/alpine3.7/cli/Dockerfile b/7.2/alpine3.7/cli/Dockerfile index e55699c931..e945e13ab4 100644 --- a/7.2/alpine3.7/cli/Dockerfile +++ b/7.2/alpine3.7/cli/Dockerfile @@ -113,6 +113,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.2/alpine3.7/fpm/Dockerfile b/7.2/alpine3.7/fpm/Dockerfile index 86daca03f6..3ace28236f 100644 --- a/7.2/alpine3.7/fpm/Dockerfile +++ b/7.2/alpine3.7/fpm/Dockerfile @@ -114,6 +114,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.2/alpine3.7/zts/Dockerfile b/7.2/alpine3.7/zts/Dockerfile index 5619eab809..5f2887cd21 100644 --- a/7.2/alpine3.7/zts/Dockerfile +++ b/7.2/alpine3.7/zts/Dockerfile @@ -114,6 +114,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile index 13b0fdac38..cc8cd89222 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -193,6 +193,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile index a27d5821c4..b729dfff33 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -134,6 +134,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile index 3d3cc96e85..298da11bff 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -135,6 +135,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile index ca53be6b71..aea68cbb34 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -135,6 +135,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index e67c411c83..3d10bc26ea 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -107,6 +107,9 @@ RUN set -xe \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 004de9301b..02a9908f48 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -128,6 +128,9 @@ RUN set -eux; \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ \ +# make sure invalid --configure-flags are fatal errors intead of just warnings + --enable-option-checking=fatal \ + \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439