Skip to content

Commit 1df2501

Browse files
committed
Switch to "--with-mhash" instead (to break less users)
1 parent b6c5891 commit 1df2501

File tree

33 files changed

+65
-17
lines changed

33 files changed

+65
-17
lines changed

5.6/alpine3.4/cli/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ RUN set -xe \
115115
--disable-cgi \
116116
\
117117
# https://github.com/docker-library/php/issues/439
118-
--disable-hash \
118+
--with-mhash \
119119
\
120120
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
121121
--enable-ftp \

5.6/alpine3.4/fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -xe \
116116
--disable-cgi \
117117
\
118118
# https://github.com/docker-library/php/issues/439
119-
--disable-hash \
119+
--with-mhash \
120120
\
121121
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
122122
--enable-ftp \

5.6/alpine3.4/zts/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -xe \
116116
--disable-cgi \
117117
\
118118
# https://github.com/docker-library/php/issues/439
119-
--disable-hash \
119+
--with-mhash \
120120
\
121121
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
122122
--enable-ftp \

5.6/jessie/apache/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ RUN set -eux; \
193193
\
194194
--disable-cgi \
195195
\
196+
# https://github.com/docker-library/php/issues/439
197+
--with-mhash \
198+
\
196199
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
197200
--enable-ftp \
198201
# --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)

5.6/jessie/cli/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ RUN set -eux; \
134134
\
135135
--disable-cgi \
136136
\
137+
# https://github.com/docker-library/php/issues/439
138+
--with-mhash \
139+
\
137140
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
138141
--enable-ftp \
139142
# --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)

5.6/jessie/fpm/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ RUN set -eux; \
135135
\
136136
--disable-cgi \
137137
\
138+
# https://github.com/docker-library/php/issues/439
139+
--with-mhash \
140+
\
138141
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
139142
--enable-ftp \
140143
# --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)

5.6/jessie/zts/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ RUN set -eux; \
135135
\
136136
--disable-cgi \
137137
\
138+
# https://github.com/docker-library/php/issues/439
139+
--with-mhash \
140+
\
138141
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
139142
--enable-ftp \
140143
# --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)

7.0/alpine3.4/cli/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ RUN set -xe \
115115
--disable-cgi \
116116
\
117117
# https://github.com/docker-library/php/issues/439
118-
--disable-hash \
118+
--with-mhash \
119119
\
120120
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
121121
--enable-ftp \

7.0/alpine3.4/fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -xe \
116116
--disable-cgi \
117117
\
118118
# https://github.com/docker-library/php/issues/439
119-
--disable-hash \
119+
--with-mhash \
120120
\
121121
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
122122
--enable-ftp \

7.0/alpine3.4/zts/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -xe \
116116
--disable-cgi \
117117
\
118118
# https://github.com/docker-library/php/issues/439
119-
--disable-hash \
119+
--with-mhash \
120120
\
121121
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
122122
--enable-ftp \

7.0/jessie/apache/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ RUN set -eux; \
193193
\
194194
--disable-cgi \
195195
\
196+
# https://github.com/docker-library/php/issues/439
197+
--with-mhash \
198+
\
196199
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
197200
--enable-ftp \
198201
# --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)

7.0/jessie/cli/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ RUN set -eux; \
134134
\
135135
--disable-cgi \
136136
\
137+
# https://github.com/docker-library/php/issues/439
138+
--with-mhash \
139+
\
137140
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
138141
--enable-ftp \
139142
# --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)

7.0/jessie/fpm/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ RUN set -eux; \
135135
\
136136
--disable-cgi \
137137
\
138+
# https://github.com/docker-library/php/issues/439
139+
--with-mhash \
140+
\
138141
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
139142
--enable-ftp \
140143
# --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)

7.0/jessie/zts/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ RUN set -eux; \
135135
\
136136
--disable-cgi \
137137
\
138+
# https://github.com/docker-library/php/issues/439
139+
--with-mhash \
140+
\
138141
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
139142
--enable-ftp \
140143
# --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)

7.1/alpine3.4/cli/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ RUN set -xe \
115115
--disable-cgi \
116116
\
117117
# https://github.com/docker-library/php/issues/439
118-
--disable-hash \
118+
--with-mhash \
119119
\
120120
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
121121
--enable-ftp \

7.1/alpine3.4/fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -xe \
116116
--disable-cgi \
117117
\
118118
# https://github.com/docker-library/php/issues/439
119-
--disable-hash \
119+
--with-mhash \
120120
\
121121
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
122122
--enable-ftp \

7.1/alpine3.4/zts/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -xe \
116116
--disable-cgi \
117117
\
118118
# https://github.com/docker-library/php/issues/439
119-
--disable-hash \
119+
--with-mhash \
120120
\
121121
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
122122
--enable-ftp \

7.1/jessie/apache/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ RUN set -eux; \
193193
\
194194
--disable-cgi \
195195
\
196+
# https://github.com/docker-library/php/issues/439
197+
--with-mhash \
198+
\
196199
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
197200
--enable-ftp \
198201
# --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)

7.1/jessie/cli/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ RUN set -eux; \
134134
\
135135
--disable-cgi \
136136
\
137+
# https://github.com/docker-library/php/issues/439
138+
--with-mhash \
139+
\
137140
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
138141
--enable-ftp \
139142
# --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)

7.1/jessie/fpm/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ RUN set -eux; \
135135
\
136136
--disable-cgi \
137137
\
138+
# https://github.com/docker-library/php/issues/439
139+
--with-mhash \
140+
\
138141
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
139142
--enable-ftp \
140143
# --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)

7.1/jessie/zts/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ RUN set -eux; \
135135
\
136136
--disable-cgi \
137137
\
138+
# https://github.com/docker-library/php/issues/439
139+
--with-mhash \
140+
\
138141
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
139142
--enable-ftp \
140143
# --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)

7.2/alpine3.6/cli/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -xe \
116116
--disable-cgi \
117117
\
118118
# https://github.com/docker-library/php/issues/439
119-
--disable-hash \
119+
--with-mhash \
120120
\
121121
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
122122
--enable-ftp \

7.2/alpine3.6/fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ RUN set -xe \
117117
--disable-cgi \
118118
\
119119
# https://github.com/docker-library/php/issues/439
120-
--disable-hash \
120+
--with-mhash \
121121
\
122122
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
123123
--enable-ftp \

7.2/alpine3.6/zts/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ RUN set -xe \
117117
--disable-cgi \
118118
\
119119
# https://github.com/docker-library/php/issues/439
120-
--disable-hash \
120+
--with-mhash \
121121
\
122122
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
123123
--enable-ftp \

7.2/alpine3.7/cli/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -xe \
116116
--disable-cgi \
117117
\
118118
# https://github.com/docker-library/php/issues/439
119-
--disable-hash \
119+
--with-mhash \
120120
\
121121
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
122122
--enable-ftp \

7.2/alpine3.7/fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ RUN set -xe \
117117
--disable-cgi \
118118
\
119119
# https://github.com/docker-library/php/issues/439
120-
--disable-hash \
120+
--with-mhash \
121121
\
122122
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
123123
--enable-ftp \

7.2/alpine3.7/zts/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ RUN set -xe \
117117
--disable-cgi \
118118
\
119119
# https://github.com/docker-library/php/issues/439
120-
--disable-hash \
120+
--with-mhash \
121121
\
122122
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
123123
--enable-ftp \

7.2/stretch/apache/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ RUN set -eux; \
195195
\
196196
--disable-cgi \
197197
\
198+
# https://github.com/docker-library/php/issues/439
199+
--with-mhash \
200+
\
198201
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
199202
--enable-ftp \
200203
# --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)

7.2/stretch/cli/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@ RUN set -eux; \
136136
\
137137
--disable-cgi \
138138
\
139+
# https://github.com/docker-library/php/issues/439
140+
--with-mhash \
141+
\
139142
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
140143
--enable-ftp \
141144
# --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)

7.2/stretch/fpm/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ RUN set -eux; \
137137
\
138138
--disable-cgi \
139139
\
140+
# https://github.com/docker-library/php/issues/439
141+
--with-mhash \
142+
\
140143
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
141144
--enable-ftp \
142145
# --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)

7.2/stretch/zts/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ RUN set -eux; \
137137
\
138138
--disable-cgi \
139139
\
140+
# https://github.com/docker-library/php/issues/439
141+
--with-mhash \
142+
\
140143
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
141144
--enable-ftp \
142145
# --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)

Dockerfile-alpine.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ RUN set -xe \
110110
--disable-cgi \
111111
\
112112
# https://github.com/docker-library/php/issues/439
113-
--disable-hash \
113+
--with-mhash \
114114
\
115115
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
116116
--enable-ftp \

Dockerfile-debian.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ RUN set -eux; \
131131
--disable-cgi \
132132
\
133133
# https://github.com/docker-library/php/issues/439
134-
--disable-hash \
134+
--with-mhash \
135135
\
136136
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
137137
--enable-ftp \

0 commit comments

Comments
 (0)