From 1df250181742aef278c7537f534dddeb0aa1b948 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 26 Apr 2018 13:45:14 -0700 Subject: [PATCH] Switch to "--with-mhash" instead (to break less users) --- 5.6/alpine3.4/cli/Dockerfile | 2 +- 5.6/alpine3.4/fpm/Dockerfile | 2 +- 5.6/alpine3.4/zts/Dockerfile | 2 +- 5.6/jessie/apache/Dockerfile | 3 +++ 5.6/jessie/cli/Dockerfile | 3 +++ 5.6/jessie/fpm/Dockerfile | 3 +++ 5.6/jessie/zts/Dockerfile | 3 +++ 7.0/alpine3.4/cli/Dockerfile | 2 +- 7.0/alpine3.4/fpm/Dockerfile | 2 +- 7.0/alpine3.4/zts/Dockerfile | 2 +- 7.0/jessie/apache/Dockerfile | 3 +++ 7.0/jessie/cli/Dockerfile | 3 +++ 7.0/jessie/fpm/Dockerfile | 3 +++ 7.0/jessie/zts/Dockerfile | 3 +++ 7.1/alpine3.4/cli/Dockerfile | 2 +- 7.1/alpine3.4/fpm/Dockerfile | 2 +- 7.1/alpine3.4/zts/Dockerfile | 2 +- 7.1/jessie/apache/Dockerfile | 3 +++ 7.1/jessie/cli/Dockerfile | 3 +++ 7.1/jessie/fpm/Dockerfile | 3 +++ 7.1/jessie/zts/Dockerfile | 3 +++ 7.2/alpine3.6/cli/Dockerfile | 2 +- 7.2/alpine3.6/fpm/Dockerfile | 2 +- 7.2/alpine3.6/zts/Dockerfile | 2 +- 7.2/alpine3.7/cli/Dockerfile | 2 +- 7.2/alpine3.7/fpm/Dockerfile | 2 +- 7.2/alpine3.7/zts/Dockerfile | 2 +- 7.2/stretch/apache/Dockerfile | 3 +++ 7.2/stretch/cli/Dockerfile | 3 +++ 7.2/stretch/fpm/Dockerfile | 3 +++ 7.2/stretch/zts/Dockerfile | 3 +++ Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- 33 files changed, 65 insertions(+), 17 deletions(-) diff --git a/5.6/alpine3.4/cli/Dockerfile b/5.6/alpine3.4/cli/Dockerfile index 43a29ec3c..067f7c6a5 100644 --- a/5.6/alpine3.4/cli/Dockerfile +++ b/5.6/alpine3.4/cli/Dockerfile @@ -115,7 +115,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/5.6/alpine3.4/fpm/Dockerfile b/5.6/alpine3.4/fpm/Dockerfile index 310fbea34..787c82bf3 100644 --- a/5.6/alpine3.4/fpm/Dockerfile +++ b/5.6/alpine3.4/fpm/Dockerfile @@ -116,7 +116,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/5.6/alpine3.4/zts/Dockerfile b/5.6/alpine3.4/zts/Dockerfile index fe905412b..cf19de1c4 100644 --- a/5.6/alpine3.4/zts/Dockerfile +++ b/5.6/alpine3.4/zts/Dockerfile @@ -116,7 +116,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile index a42def2d9..434520d9e 100644 --- a/5.6/jessie/apache/Dockerfile +++ b/5.6/jessie/apache/Dockerfile @@ -193,6 +193,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/5.6/jessie/cli/Dockerfile b/5.6/jessie/cli/Dockerfile index a0beb3b65..86f4beced 100644 --- a/5.6/jessie/cli/Dockerfile +++ b/5.6/jessie/cli/Dockerfile @@ -134,6 +134,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/5.6/jessie/fpm/Dockerfile b/5.6/jessie/fpm/Dockerfile index 8bbb856b5..6a55eedfe 100644 --- a/5.6/jessie/fpm/Dockerfile +++ b/5.6/jessie/fpm/Dockerfile @@ -135,6 +135,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/5.6/jessie/zts/Dockerfile b/5.6/jessie/zts/Dockerfile index 8f59189d1..c83738c24 100644 --- a/5.6/jessie/zts/Dockerfile +++ b/5.6/jessie/zts/Dockerfile @@ -135,6 +135,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.0/alpine3.4/cli/Dockerfile b/7.0/alpine3.4/cli/Dockerfile index 5ff25a0de..29d6f6210 100644 --- a/7.0/alpine3.4/cli/Dockerfile +++ b/7.0/alpine3.4/cli/Dockerfile @@ -115,7 +115,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.0/alpine3.4/fpm/Dockerfile b/7.0/alpine3.4/fpm/Dockerfile index 094b49b79..b98abf9cf 100644 --- a/7.0/alpine3.4/fpm/Dockerfile +++ b/7.0/alpine3.4/fpm/Dockerfile @@ -116,7 +116,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.0/alpine3.4/zts/Dockerfile b/7.0/alpine3.4/zts/Dockerfile index 0db93ea3f..e972ef603 100644 --- a/7.0/alpine3.4/zts/Dockerfile +++ b/7.0/alpine3.4/zts/Dockerfile @@ -116,7 +116,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile index e310222f0..ba0fb265b 100644 --- a/7.0/jessie/apache/Dockerfile +++ b/7.0/jessie/apache/Dockerfile @@ -193,6 +193,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.0/jessie/cli/Dockerfile b/7.0/jessie/cli/Dockerfile index 1a6414ef8..d24f7322e 100644 --- a/7.0/jessie/cli/Dockerfile +++ b/7.0/jessie/cli/Dockerfile @@ -134,6 +134,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.0/jessie/fpm/Dockerfile b/7.0/jessie/fpm/Dockerfile index 48d6873a8..be0a21fc8 100644 --- a/7.0/jessie/fpm/Dockerfile +++ b/7.0/jessie/fpm/Dockerfile @@ -135,6 +135,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.0/jessie/zts/Dockerfile b/7.0/jessie/zts/Dockerfile index da37e0c07..0890c7a4f 100644 --- a/7.0/jessie/zts/Dockerfile +++ b/7.0/jessie/zts/Dockerfile @@ -135,6 +135,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.1/alpine3.4/cli/Dockerfile b/7.1/alpine3.4/cli/Dockerfile index 825c208e6..77cea1a07 100644 --- a/7.1/alpine3.4/cli/Dockerfile +++ b/7.1/alpine3.4/cli/Dockerfile @@ -115,7 +115,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.1/alpine3.4/fpm/Dockerfile b/7.1/alpine3.4/fpm/Dockerfile index f7e932815..13b21667e 100644 --- a/7.1/alpine3.4/fpm/Dockerfile +++ b/7.1/alpine3.4/fpm/Dockerfile @@ -116,7 +116,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.1/alpine3.4/zts/Dockerfile b/7.1/alpine3.4/zts/Dockerfile index 7913f608c..0e4738639 100644 --- a/7.1/alpine3.4/zts/Dockerfile +++ b/7.1/alpine3.4/zts/Dockerfile @@ -116,7 +116,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile index a9ced2349..c3009f001 100644 --- a/7.1/jessie/apache/Dockerfile +++ b/7.1/jessie/apache/Dockerfile @@ -193,6 +193,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.1/jessie/cli/Dockerfile b/7.1/jessie/cli/Dockerfile index e6688c56f..dab107672 100644 --- a/7.1/jessie/cli/Dockerfile +++ b/7.1/jessie/cli/Dockerfile @@ -134,6 +134,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.1/jessie/fpm/Dockerfile b/7.1/jessie/fpm/Dockerfile index e961452d4..108798491 100644 --- a/7.1/jessie/fpm/Dockerfile +++ b/7.1/jessie/fpm/Dockerfile @@ -135,6 +135,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.1/jessie/zts/Dockerfile b/7.1/jessie/zts/Dockerfile index 0814c7208..eb129b053 100644 --- a/7.1/jessie/zts/Dockerfile +++ b/7.1/jessie/zts/Dockerfile @@ -135,6 +135,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.2/alpine3.6/cli/Dockerfile b/7.2/alpine3.6/cli/Dockerfile index c487472ba..005eaa391 100644 --- a/7.2/alpine3.6/cli/Dockerfile +++ b/7.2/alpine3.6/cli/Dockerfile @@ -116,7 +116,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.2/alpine3.6/fpm/Dockerfile b/7.2/alpine3.6/fpm/Dockerfile index 061badf8a..0aecc2a67 100644 --- a/7.2/alpine3.6/fpm/Dockerfile +++ b/7.2/alpine3.6/fpm/Dockerfile @@ -117,7 +117,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.2/alpine3.6/zts/Dockerfile b/7.2/alpine3.6/zts/Dockerfile index 6a988f724..be1063f0c 100644 --- a/7.2/alpine3.6/zts/Dockerfile +++ b/7.2/alpine3.6/zts/Dockerfile @@ -117,7 +117,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.2/alpine3.7/cli/Dockerfile b/7.2/alpine3.7/cli/Dockerfile index be3d092fc..8487fcea3 100644 --- a/7.2/alpine3.7/cli/Dockerfile +++ b/7.2/alpine3.7/cli/Dockerfile @@ -116,7 +116,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.2/alpine3.7/fpm/Dockerfile b/7.2/alpine3.7/fpm/Dockerfile index cc9559c9f..519b3dc35 100644 --- a/7.2/alpine3.7/fpm/Dockerfile +++ b/7.2/alpine3.7/fpm/Dockerfile @@ -117,7 +117,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.2/alpine3.7/zts/Dockerfile b/7.2/alpine3.7/zts/Dockerfile index 50c71ceba..21d0bf141 100644 --- a/7.2/alpine3.7/zts/Dockerfile +++ b/7.2/alpine3.7/zts/Dockerfile @@ -117,7 +117,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile index 453812156..1b86a7767 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -195,6 +195,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile index 8bc74765a..69bbf3699 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -136,6 +136,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile index 65207dba1..9eaff1942 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -137,6 +137,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile index 64c7ad147..b19b86994 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -137,6 +137,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index c8c29116a..e67c411c8 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -110,7 +110,7 @@ RUN set -xe \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 3f96da588..004de9301 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -131,7 +131,7 @@ RUN set -eux; \ --disable-cgi \ \ # https://github.com/docker-library/php/issues/439 - --disable-hash \ + --with-mhash \ \ # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) --enable-ftp \