Skip to content

Commit

Permalink
Switch to "--with-mhash" instead (to break less users)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tianon
tianon committed Apr 26, 2018
1 parent b6c5891 commit 1df2501
Show file tree
Hide file tree
Showing 33 changed files with 65 additions and 17 deletions.
2 changes: 1 addition & 1 deletion 5.6/alpine3.4/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 5.6/alpine3.4/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 5.6/alpine3.4/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 5.6/jessie/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 5.6/jessie/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 5.6/jessie/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 5.6/jessie/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion 7.0/alpine3.4/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 7.0/alpine3.4/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 7.0/alpine3.4/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.0/jessie/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 7.0/jessie/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 7.0/jessie/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 7.0/jessie/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion 7.1/alpine3.4/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 7.1/alpine3.4/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 7.1/alpine3.4/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.1/jessie/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 7.1/jessie/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 7.1/jessie/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 7.1/jessie/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion 7.2/alpine3.6/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 7.2/alpine3.6/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 7.2/alpine3.6/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 7.2/alpine3.7/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 7.2/alpine3.7/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 7.2/alpine3.7/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.2/stretch/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 7.2/stretch/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 7.2/stretch/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions 7.2/stretch/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-debian.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 1df2501

Please sign in to comment.